diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 10:09:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 10:09:44 -0400 |
| commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
| tree | 055f1082093bb63a34c7bfe43c845567685d4675 /include/sound | |
| parent | b1cd6b9ec7c749ddfad628c8c12659591ae195e6 (diff) | |
| parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 0758a1b3ca44..475cb7ed6bec 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -205,7 +205,6 @@ struct snd_soc_jack_gpio; | |||
| 205 | #endif | 205 | #endif |
| 206 | 206 | ||
| 207 | typedef int (*hw_write_t)(void *,const char* ,int); | 207 | typedef int (*hw_write_t)(void *,const char* ,int); |
| 208 | typedef int (*hw_read_t)(void *,char* ,int); | ||
| 209 | 208 | ||
| 210 | extern struct snd_ac97_bus_ops soc_ac97_ops; | 209 | extern struct snd_ac97_bus_ops soc_ac97_ops; |
| 211 | 210 | ||