diff options
-rw-r--r-- | include/sound/tea6330t.h | 16 | ||||
-rw-r--r-- | sound/i2c/tea6330t.c | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/sound/tea6330t.h b/include/sound/tea6330t.h index 3896c0a50907..1b265bf24ee1 100644 --- a/include/sound/tea6330t.h +++ b/include/sound/tea6330t.h @@ -22,21 +22,9 @@ * */ -#include "control.h" #include "i2c.h" /* generic i2c support */ -typedef struct { - snd_i2c_device_t *device; - snd_i2c_bus_t *bus; - int equalizer; - int fader; - unsigned char regs[8]; - unsigned char mleft, mright; - unsigned char bass, treble; - unsigned char max_bass, max_treble; -} tea6330t_t; - -extern int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer); -extern int snd_tea6330t_update_mixer(snd_card_t * card, snd_i2c_bus_t * bus, int equalizer, int fader); +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); #endif /* __SOUND_TEA6330T_H */ diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c index 4fdd1fb57dfe..7bd4948c2a3b 100644 --- a/sound/i2c/tea6330t.c +++ b/sound/i2c/tea6330t.c @@ -24,6 +24,7 @@ #include <linux/init.h> #include <linux/slab.h> #include <sound/core.h> +#include <sound/control.h> #include <sound/tea6330t.h> MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); @@ -43,6 +44,17 @@ MODULE_LICENSE("GPL"); #define TEA6330T_GMU 0x80 /* mute control, general mute */ #define TEA6330T_EQN 0x40 /* equalizer switchover (0=equalizer-on) */ +typedef struct { + snd_i2c_device_t *device; + snd_i2c_bus_t *bus; + int equalizer; + int fader; + unsigned char regs[8]; + unsigned char mleft, mright; + unsigned char bass, treble; + unsigned char max_bass, max_treble; +} tea6330t_t; + int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer) { int res; |