diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-11-22 05:51:54 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:28 -0500 |
commit | 7f6301cdfad5469312d266bcec3f1a02a8e8b5af (patch) | |
tree | b70c28c12d98a86875d015ddf450fb64dbc54cc3 /sound/usb/caiaq/caiaq-input.c | |
parent | 8e3cd08ed8e590952aa9a656758cb24d4ba898f8 (diff) |
[ALSA] caiaq - remove ifdef
Remove ifdef and fix Makefile for conditional builds.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/usb/caiaq/caiaq-input.c')
-rw-r--r-- | sound/usb/caiaq/caiaq-input.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c index 00846b1f92b2..ded45e5a0b14 100644 --- a/sound/usb/caiaq/caiaq-input.c +++ b/sound/usb/caiaq/caiaq-input.c | |||
@@ -30,8 +30,6 @@ | |||
30 | #include "caiaq-device.h" | 30 | #include "caiaq-device.h" |
31 | #include "caiaq-input.h" | 31 | #include "caiaq-input.h" |
32 | 32 | ||
33 | #ifdef CONFIG_SND_USB_CAIAQ_INPUT | ||
34 | |||
35 | static unsigned short keycode_ak1[] = { KEY_C, KEY_B, KEY_A }; | 33 | static unsigned short keycode_ak1[] = { KEY_C, KEY_B, KEY_A }; |
36 | static unsigned short keycode_rk2[] = { KEY_1, KEY_2, KEY_3, KEY_4, | 34 | static unsigned short keycode_rk2[] = { KEY_1, KEY_2, KEY_3, KEY_4, |
37 | KEY_5, KEY_6, KEY_7 }; | 35 | KEY_5, KEY_6, KEY_7 }; |
@@ -359,5 +357,3 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev) | |||
359 | dev->input_dev = NULL; | 357 | dev->input_dev = NULL; |
360 | } | 358 | } |
361 | 359 | ||
362 | #endif /* CONFIG_SND_USB_CAIAQ_INPUT */ | ||
363 | |||