Merge remote branch 'korg/drm-radeon-next' into drm-linus

[safe/jmp/linux-2.6] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index dbb1702..475cb7e 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -205,7 +205,6 @@ struct snd_soc_jack_gpio;
 #endif
 
 typedef int (*hw_write_t)(void *,const char* ,int);
-typedef int (*hw_read_t)(void *,char* ,int);
 
 extern struct snd_ac97_bus_ops soc_ac97_ops;
 
@@ -416,6 +415,7 @@ struct snd_soc_codec {
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs_reg;
        struct dentry *debugfs_pop_time;
+       struct dentry *debugfs_dapm;
 #endif
 };