From: Takashi Iwai Date: Thu, 22 Nov 2007 10:51:54 +0000 (+0100) Subject: [ALSA] caiaq - remove ifdef X-Git-Tag: v2.6.25-rc1~1127^2~228 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f6301cdfad5469312d266bcec3f1a02a8e8b5af;p=linux-2.6-omap-h63xx.git [ALSA] caiaq - remove ifdef Remove ifdef and fix Makefile for conditional builds. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- diff --git a/sound/usb/caiaq/Makefile b/sound/usb/caiaq/Makefile index 345a965386a..23dadd5a11c 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 00846b1f92b..ded45e5a0b1 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 */ -