Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7f6301cdfad5469312d266bcec3f1a02a8e8b5af
Commit: 7f6301cdfad5469312d266bcec3f1a02a8e8b5af
Parent: 8e3cd08ed8e590952aa9a656758cb24d4ba898f8
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 22 11:51:54 2007 +0100
Committer: Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:28 2008 +0100
[ALSA] caiaq - remove ifdef
Remove ifdef and fix Makefile for conditional builds.
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
sound/usb/caiaq/Makefile | 3 ++-
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 345a965..23dadd5 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 00846b1..ded45e5 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 */
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
