From b99c26c7c18b767167df9c5793affc8afc150aac Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 22 Nov 2007 11:51:54 +0100 Subject: [PATCH] --- yaml --- r: 81517 b: refs/heads/master c: 7f6301cdfad5469312d266bcec3f1a02a8e8b5af h: refs/heads/master i: 81515: 4479f10bd6f5f1f08e237e7be3f66a4bacae6d48 v: v3 --- [refs] | 2 +- trunk/sound/usb/caiaq/Makefile | 3 ++- trunk/sound/usb/caiaq/caiaq-input.c | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c87509edf522..0f7f7c188601 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e3cd08ed8e590952aa9a656758cb24d4ba898f8 +refs/heads/master: 7f6301cdfad5469312d266bcec3f1a02a8e8b5af diff --git a/trunk/sound/usb/caiaq/Makefile b/trunk/sound/usb/caiaq/Makefile index 345a965386a7..23dadd5a11cd 100644 --- a/trunk/sound/usb/caiaq/Makefile +++ b/trunk/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/trunk/sound/usb/caiaq/caiaq-input.c b/trunk/sound/usb/caiaq/caiaq-input.c index 00846b1f92b2..ded45e5a0b14 100644 --- a/trunk/sound/usb/caiaq/caiaq-input.c +++ b/trunk/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 */ -