diff options
Diffstat (limited to 'sound/pci/ice1712/amp.c')
-rw-r--r-- | sound/pci/ice1712/amp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c index e525da2673be..2f9b93467867 100644 --- a/sound/pci/ice1712/amp.c +++ b/sound/pci/ice1712/amp.c | |||
@@ -21,7 +21,6 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <asm/io.h> | ||
25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
@@ -38,7 +37,7 @@ static void wm_put(struct snd_ice1712 *ice, int reg, unsigned short val) | |||
38 | snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff); | 37 | snd_vt1724_write_i2c(ice, WM_DEV, cval >> 8, cval & 0xff); |
39 | } | 38 | } |
40 | 39 | ||
41 | static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice) | 40 | static int snd_vt1724_amp_init(struct snd_ice1712 *ice) |
42 | { | 41 | { |
43 | static const unsigned short wm_inits[] = { | 42 | static const unsigned short wm_inits[] = { |
44 | WM_ATTEN_L, 0x0000, /* 0 db */ | 43 | WM_ATTEN_L, 0x0000, /* 0 db */ |
@@ -66,7 +65,7 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice) | |||
66 | return 0; | 65 | return 0; |
67 | } | 66 | } |
68 | 67 | ||
69 | static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice) | 68 | static int snd_vt1724_amp_add_controls(struct snd_ice1712 *ice) |
70 | { | 69 | { |
71 | if (ice->ac97) | 70 | if (ice->ac97) |
72 | /* we use pins 39 and 41 of the VT1616 for left and right | 71 | /* we use pins 39 and 41 of the VT1616 for left and right |
@@ -78,7 +77,7 @@ static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice) | |||
78 | 77 | ||
79 | 78 | ||
80 | /* entry point */ | 79 | /* entry point */ |
81 | struct snd_ice1712_card_info snd_vt1724_amp_cards[] __devinitdata = { | 80 | struct snd_ice1712_card_info snd_vt1724_amp_cards[] = { |
82 | { | 81 | { |
83 | .subvendor = VT1724_SUBDEVICE_AV710, | 82 | .subvendor = VT1724_SUBDEVICE_AV710, |
84 | .name = "Chaintech AV-710", | 83 | .name = "Chaintech AV-710", |