diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-11-22 11:51:54 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:28 +0100 |
| commit | 7f6301cdfad5469312d266bcec3f1a02a8e8b5af (patch) | |
| tree | b70c28c12d98a86875d015ddf450fb64dbc54cc3 /sound/usb | |
| parent | 8e3cd08ed8e590952aa9a656758cb24d4ba898f8 (diff) | |
| download | linux-7f6301cdfad5469312d266bcec3f1a02a8e8b5af.tar.bz2 | |
[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')
| -rw-r--r-- | sound/usb/caiaq/Makefile | 3 | ||||
| -rw-r--r-- | sound/usb/caiaq/caiaq-input.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sound/usb/caiaq/Makefile b/sound/usb/caiaq/Makefile index 345a965386a7..23dadd5a11cd 100644 --- a/sound/usb/caiaq/Makefile +++ b/sound/usb/caiaq/Makefile @@ -1,3 +1,4 @@ -snd-usb-caiaq-objs := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-input.o caiaq-control.o +snd-usb-caiaq-y := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-control.o +snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += caiaq-input.o obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.o 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 @@ #include "caiaq-device.h" #include "caiaq-input.h" -#ifdef CONFIG_SND_USB_CAIAQ_INPUT - static unsigned short keycode_ak1[] = { KEY_C, KEY_B, KEY_A }; static unsigned short keycode_rk2[] = { KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7 }; @@ -359,5 +357,3 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev) dev->input_dev = NULL; } -#endif /* CONFIG_SND_USB_CAIAQ_INPUT */ - |