Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10c63c9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 



Pull more USB patches from Greg Kroah-Hartman:
 "Here are 10 more USB patches for 3.6-rc3.  They all fix reported
  problems (build problems for one of them, and easily repeatable oopses
  for the others.)

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  gpu/mfd/usb: Fix USB randconfig problems
  USB: CDC ACM: Fix NULL pointer dereference
  USB: emi62: remove __devinit* from the struct usb_device_id table
  USB: winbond: remove __devinit* from the struct usb_device_id table
  USB: vt6656: remove __devinit* from the struct usb_device_id table
  USB: rtl8187: remove __devinit* from the struct usb_device_id table
  USB: p54usb: remove __devinit* from the struct usb_device_id table
  USB: spca506: remove __devinit* from the struct usb_device_id table
  USB: jl2005bcd: remove __devinit* from the struct usb_device_id table
  USB: smsusb: remove __devinit* from the struct usb_device_id table
parents c3e2f79d 8f057d7b

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ menuconfig DRM 
config DRM_USB

	tristate

	depends on DRM

	depends on USB_ARCH_HAS_HCD

	select USB



config DRM_KMS_HELPER

drivers/gpu/drm/udl/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DRM_UDL

	tristate "DisplayLink"

	depends on DRM && EXPERIMENTAL

	depends on USB_ARCH_HAS_HCD

	select DRM_USB

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

drivers/media/dvb/siano/smsusb.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int smsusb_resume(struct usb_interface *intf) 
	return 0;

}



static const struct usb_device_id smsusb_id_table[] __devinitconst = {

static const struct usb_device_id smsusb_id_table[] = {

	{ USB_DEVICE(0x187f, 0x0010),

		.driver_info = SMS1XXX_BOARD_SIANO_STELLAR },

	{ USB_DEVICE(0x187f, 0x0100),

drivers/media/video/gspca/jl2005bcd.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x0979, 0x0227)},

	{}

};

drivers/media/video/gspca/spca506.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

static const struct usb_device_id device_table[] __devinitconst = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x06e1, 0xa190)},

/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505

	{USB_DEVICE(0x0733, 0x0430)}, */