diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/usb | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/input/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index a2c56b2de589..3305fb6079eb 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
| @@ -1818,7 +1818,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) | |||
| 1818 | int n, len, insize = 0; | 1818 | int n, len, insize = 0; |
| 1819 | 1819 | ||
| 1820 | /* Ignore all Wacom devices */ | 1820 | /* Ignore all Wacom devices */ |
| 1821 | if (dev->descriptor.idVendor == USB_VENDOR_ID_WACOM) | 1821 | if (le16_to_cpu(dev->descriptor.idVendor) == USB_VENDOR_ID_WACOM) |
| 1822 | return NULL; | 1822 | return NULL; |
| 1823 | 1823 | ||
| 1824 | for (n = 0; hid_blacklist[n].idVendor; n++) | 1824 | for (n = 0; hid_blacklist[n].idVendor; n++) |