diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-22 16:13:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-22 16:13:32 +0100 |
| commit | 9bb533b29a07fe84434834399e6479d3aa393f73 (patch) | |
| tree | 3e24d4d4a91a2f51c8741a170e45bd840d6f5f8a | |
| parent | 0b4baa69fc5137bc848ebcdfa93c4b891ade1754 (diff) | |
| download | alsa-driver-build-unstable-9bb533b29a07fe84434834399e6479d3aa393f73.tar.gz | |
Refreshed usb/caiaq/input.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | usb/caiaq/input.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usb/caiaq/input.patch b/usb/caiaq/input.patch index e54ee0a35..ab837d4f4 100644 --- a/usb/caiaq/input.patch +++ b/usb/caiaq/input.patch @@ -1,12 +1,12 @@ ---- ../../alsa-kernel/usb/caiaq/input.c 2009-04-14 13:38:05.000000000 +0200 -+++ input.c 2009-04-14 13:41:51.000000000 +0200 +--- ../../alsa-kernel/usb/caiaq/input.c 2010-03-22 16:10:59.103773419 +0100 ++++ input.c 2010-03-22 16:12:45.419731229 +0100 @@ -1,3 +1,5 @@ +#include "adriver.h" +#include "../usbcompat.h" /* * Copyright (c) 2006,2007 Daniel Mack, Tim Ruetz * -@@ -18,12 +20,29 @@ +@@ -18,13 +20,30 @@ #include <linux/init.h> #include <linux/usb.h> @@ -15,6 +15,7 @@ +#else +#include <linux/usb_input.h> +#endif + #include <sound/core.h> #include <sound/pcm.h> #include "device.h" @@ -36,7 +37,7 @@ 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 }; -@@ -263,7 +282,11 @@ +@@ -346,7 +365,11 @@ input->name = dev->product_name; input->phys = dev->phys; usb_to_input_id(usb_dev, &input->id); @@ -46,5 +47,5 @@ + input->cdev.dev = &usb_dev->dev; +#endif - switch (dev->chip.usb_id) { - case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2): + input_set_drvdata(input, dev); + |