lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] caiaq - remove ifdef

Browse Source 
Remove ifdef and fix Makefile for conditional builds.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Iwai
2007-11-22 11:51:54 +01:00
committed by Jaroslav Kysela
parent 8e3cd08ed8
commit 7f6301cdfa
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/usb/caiaq/Makefile
View File

@@ -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 obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.o

4
sound/usb/caiaq/caiaq-input.c
View File

@@ -30,8 +30,6 @@
#include "caiaq-device.h" #include "caiaq-device.h"
#include "caiaq-input.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_ak1[] = { KEY_C, KEY_B, KEY_A };
static unsigned short keycode_rk2[] = { KEY_1, KEY_2, KEY_3, KEY_4, static unsigned short keycode_rk2[] = { KEY_1, KEY_2, KEY_3, KEY_4,
KEY_5, KEY_6, KEY_7 }; 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; dev->input_dev = NULL;
} }
#endif /* CONFIG_SND_USB_CAIAQ_INPUT */