Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (d3b8a1a8) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-omap/usb.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -288,8 +288,8 @@ static void usb_release(struct device *dev)
		static struct resource udc_resources[] = {
		/* order is significant! */
		{ /* registers */
		.start = IO_ADDRESS(UDC_BASE),
		.end = IO_ADDRESS(UDC_BASE + 0xff),
		.start = UDC_BASE,
		.end = UDC_BASE + 0xff,
		.flags = IORESOURCE_MEM,
		}, { /* general IRQ */
		.start = IH2_BASE + 20,
		@@ -355,8 +355,8 @@ static struct platform_device ohci_device = {
		static struct resource otg_resources[] = {
		/* order is significant! */
		{
		.start = IO_ADDRESS(OTG_BASE),
		.end = IO_ADDRESS(OTG_BASE + 0xff),
		.start = OTG_BASE,
		.end = OTG_BASE + 0xff,
		.flags = IORESOURCE_MEM,
		}, {
		.start = IH2_BASE + 8,

drivers/usb/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ obj-$(CONFIG_USB) += core/
		obj-$(CONFIG_USB_MON) += mon/

		obj-$(CONFIG_USB_EHCI_HCD) += host/
		obj-$(CONFIG_USB_ISP116X_HCD) += host/
		obj-$(CONFIG_USB_OHCI_HCD) += host/
		obj-$(CONFIG_USB_UHCI_HCD) += host/
		obj-$(CONFIG_USB_SL811_HCD) += host/

drivers/usb/atm/Kconfig

+40 −10

Original line number	Diff line number	Diff line
		#
		# USB ATM driver configuration
		# USB/ATM DSL configuration
		#
		comment "USB ATM/DSL drivers"

		menu "USB DSL modem support"
		depends on USB

		config USB_ATM
		tristate "Generic USB ATM/DSL core I/O support"
		tristate "USB DSL modem support"
		depends on USB && ATM
		select CRC32
		default n
		help
		This provides a library which is used for packet I/O by USB DSL
		modems, such as the SpeedTouch driver below.
		Say Y here if you want to connect a USB Digital Subscriber Line (DSL)
		modem to your computer's USB port. You will then need to choose your
		modem from the list below.

		To compile this driver as a module, choose M here: the
		module will be called usb_atm.
		module will be called usbatm.

		config USB_SPEEDTOUCH
		tristate "Alcatel Speedtouch USB support"
		depends on USB && ATM
		select USB_ATM
		tristate "Speedtouch USB support"
		depends on USB_ATM
		select FW_LOADER
		help
		Say Y here if you have an Alcatel SpeedTouch USB or SpeedTouch 330
		Say Y here if you have an SpeedTouch USB or SpeedTouch 330
		modem. In order to use your modem you will need to install the
		two parts of the firmware, extracted by the user space tools; see
		<http://www.linux-usb.org/SpeedTouch/> for details.

		To compile this driver as a module, choose M here: the
		module will be called speedtch.

		config USB_CXACRU
		tristate "Conexant AccessRunner USB support"
		depends on USB_ATM
		select FW_LOADER
		help
		Say Y here if you have an ADSL USB modem based on the Conexant
		AccessRunner chipset. In order to use your modem you will need to
		install the firmware, extracted by the user space tools; see
		<http://accessrunner.sourceforge.net/> for details.

		To compile this driver as a module, choose M here: the
		module will be called cxacru.

		config USB_XUSBATM
		tristate "Other USB DSL modem support"
		depends on USB_ATM
		help
		Say Y here if you have a DSL USB modem not explicitly supported by
		another USB DSL drivers. In order to use your modem you will need to
		pass the vendor ID, product ID, and endpoint numbers for transmission
		and reception as module parameters. You may need to initialize the
		the modem using a user space utility (a firmware loader for example).

		To compile this driver as a module, choose M here: the
		module will be called xusbatm.

		endmenu

drivers/usb/atm/Makefile

+4 −3

Original line number	Diff line number	Diff line
		#
		# Makefile for the rest of the USB drivers
		# (the ones that don't fit into any other categories)
		# Makefile for USB ATM/xDSL drivers
		#

		obj-$(CONFIG_USB_ATM) += usb_atm.o
		obj-$(CONFIG_USB_CXACRU) += cxacru.o
		obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o
		obj-$(CONFIG_USB_ATM) += usbatm.o
		obj-$(CONFIG_USB_XUSBATM) += xusbatm.o