Merge branch 'for-2.6.32' into for-2.6.33

2009-09-18 15:09:44 +01:00
parent b1cd6b9ec7 0c31cf3e4a
commit 9f072b7b22
16 changed files with 178 additions and 82 deletions
--- 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;