diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
| commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /drivers/hid/hid-ids.h | |
| parent | 144c7494239f12d554806439a17ad8203c7b2d3a (diff) | |
| parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff) | |
| download | linux-stable-b9afa3e015273a52718e0a7efe198a0df76be880.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d3fc13ae094d..85c6d13c9ffa 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -188,6 +188,7 @@ #define USB_VENDOR_ID_DWAV 0x0eef #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 |