diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:39:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:39:22 -0500 |
commit | 2ac9d7aaccbd598b5bd19ac40761b723bb675442 (patch) | |
tree | 09132a44e33798aaa5e80f10bf025b510015cab3 /drivers/usb/host/Kconfig | |
parent | 5ede3ceb7b2c2843e153a1803edbdc8c56655950 (diff) | |
parent | dcf7ec5ee62a78123057a1e286c88ca739717409 (diff) |
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Driver specific changes
Again, a lot of platforms have changes in here: pxa, samsung, omap,
at91, imx, ...
* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
ARM: sa1100: clean up of the clock support
ARM: pxa: add dummy clock for sa1100-rtc
RTC: sa1100: support sa1100, pxa and mmp soc families
RTC: sa1100: remove redundant code of setting alarm
RTC: sa1100: Clean out ost register
Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
ARM: EXYNOS: Modified files for SPI consolidation work
ARM: S5P64X0: Enable SDHCI support
ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
ARM: S5P64X0: Add HSMMC setup for host Controller
ARM: EXYNOS: Add USB OHCI support to ORIGEN board
USB: Add Samsung Exynos OHCI diver
ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
ARM: EXYNOS: Add USB OHCI device
net: macb: fix build break with !CONFIG_OF
i2c: tegra: Support DVC controller in device tree
i2c: tegra: Add __devinit/exit to probe/remove
net/at91_ether: use gpio_is_valid for phy IRQ line
ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
...
Diffstat (limited to 'drivers/usb/host/Kconfig')
-rw-r--r-- | drivers/usb/host/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index a52769b5c904..4c0c9734251d 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -380,6 +380,12 @@ config USB_OHCI_SH | |||
380 | Enables support for the on-chip OHCI controller on the SuperH. | 380 | Enables support for the on-chip OHCI controller on the SuperH. |
381 | If you use the PCI OHCI controller, this option is not necessary. | 381 | If you use the PCI OHCI controller, this option is not necessary. |
382 | 382 | ||
383 | config USB_OHCI_EXYNOS | ||
384 | boolean "OHCI support for Samsung EXYNOS SoC Series" | ||
385 | depends on USB_OHCI_HCD && ARCH_EXYNOS | ||
386 | help | ||
387 | Enable support for the Samsung Exynos SOC's on-chip OHCI controller. | ||
388 | |||
383 | config USB_CNS3XXX_OHCI | 389 | config USB_CNS3XXX_OHCI |
384 | bool "Cavium CNS3XXX OHCI Module" | 390 | bool "Cavium CNS3XXX OHCI Module" |
385 | depends on USB_OHCI_HCD && ARCH_CNS3XXX | 391 | depends on USB_OHCI_HCD && ARCH_CNS3XXX |