Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / include / sound / tea6330t.h

diff --git a/include/sound/tea6330t.h b/include/sound/tea6330t.h
index 1b265bf24ee10bc3188e25b8aff609d6edf70ca2..51b282b768965c5f7f75748d697d1ae64d1cde1b 100644 (file)
--- a/include/sound/tea6330t.h
+++ b/include/sound/tea6330t.h
@@ -24,7 +24,8 @@
 
 #include "i2c.h"               /* generic i2c support */
 
-int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer);
-int snd_tea6330t_update_mixer(snd_card_t * card, snd_i2c_bus_t * bus, int equalizer, int fader);
+int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer);
+int snd_tea6330t_update_mixer(struct snd_card *card, struct snd_i2c_bus *bus,
+                             int equalizer, int fader);
 
 #endif /* __SOUND_TEA6330T_H */