Commit 7f6301cd authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] caiaq - remove ifdef 



Remove ifdef and fix Makefile for conditional builds.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 8e3cd08e

sound/usb/caiaq/Makefile

+2 −1
Original line number Diff line number Diff line 
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

sound/usb/caiaq/caiaq-input.c

+0 −4
Original line number Diff line number Diff line
@@ -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 */