Prev: tree-wide: fix spelling of 'success'
Next: [PATCH] obsolete config in kernel source (IP_ROUTE_PERVASIVE)
From: Jiri Kosina on 3 Feb 2010 06:10 On Tue, 2 Feb 2010, Alex Neblett wrote: > > Added support for the Pixart Imaging Inc. Optical Touch Screen found > in the MSI AE2220 and other new all in one computers to the Quanta > Optical Touch dual-touch panel driver found in the latest > git clone > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git. > > Signed-off-by: Alex Neblett <alexneblett01(a)yahoo.com> > > > diff -uNr linux-next/drivers/hid/.directory linux-next-multitouch/drivers/hid/.directory > --- linux-next/drivers/hid/.directory 1969-12-31 18:00:00.000000000 -0600 > +++ linux-next-multitouch/drivers/hid/.directory 2010-02-02 22:47:41.875840766 -0600 > @@ -0,0 +1,3 @@ > +[Dolphin] > +Timestamp=2010,2,2,22,47,41 > +ViewMode=1 Hi Alex, I guess you don't want this file to be added to the kernel tree, right? :) > diff -uNr linux-next/drivers/hid/hid-core.c linux-next-multitouch/drivers/hid/hid-core.c > --- linux-next/drivers/hid/hid-core.c 2010-02-02 22:33:15.479259757 -0600 > +++ linux-next-multitouch/drivers/hid/hid-core.c 2010-02-02 22:44:33.125442262 -0600 > @@ -1343,6 +1343,7 @@ > { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, > { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, > { HID_USB_DEVICE(USB_VENDOR_IDhttp://us.mg201.mail.yahoo.com/dc/launch?dgfs=1_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, > + { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, Out of curiosity, where did the yahoo.com URL in the patch context come from? > { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, > { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, > { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, > diff -uNr linux-next/drivers/hid/hid-ids.h linux-next-multitouch/drivers/hid/hid-ids.h > --- linux-next/drivers/hid/hid-ids.h 2010-02-02 22:33:15.479259757 -0600 > +++ linux-next-multitouch/drivers/hid/hid-ids.h 2010-02-02 22:45:08.318770969 -0600 > @@ -394,6 +394,7 @@ > > #define USB_VENDOR_ID_QUANTA 0x0408 > #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000 > +#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001 > > #define USB_VENDOR_ID_SAMSUNG 0x0419 > #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 > diff -uNr linux-next/drivers/hid/hid-quanta.c linux-next-multitouch/drivers/hid/hid-quanta.c > --- linux-next/drivers/hid/hid-quanta.c 2010-02-02 22:33:15.482592844 -0600 > +++ linux-next-multitouch/drivers/hid/hid-quanta.c 2010-02-02 22:45:42.482100482 -0600 > @@ -224,6 +224,8 @@ > static const struct hid_device_id quanta_devices[] = { > { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, > USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, > + { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, > + USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) }, > { } > }; > MODULE_DEVICE_TABLE(hid, quanta_devices); Anyway I have fixed the above issues manually and applied your patch, but please be aware of this for any submissions in the future. Thanks! -- Jiri Kosina SUSE Labs, Novell Inc. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |