Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[~andy/linux] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index a52769b5c9044d8e306f26b8e8bffe5e15db2107..91413cac97beec3d17c20aff307c4236f2a5a192 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -219,7 +219,7 @@ config USB_CNS3XXX_EHCI
 
 config USB_EHCI_ATH79
        bool "EHCI support for AR7XXX/AR9XXX SoCs"
-       depends on USB_EHCI_HCD && (SOC_AR71XX || SOC_AR724X || SOC_AR913X)
+       depends on USB_EHCI_HCD && (SOC_AR71XX || SOC_AR724X || SOC_AR913X || SOC_AR933X)
        select USB_EHCI_ROOT_HUB_TT
        default y
        ---help---
@@ -380,6 +380,12 @@ config USB_OHCI_SH
          Enables support for the on-chip OHCI controller on the SuperH.
          If you use the PCI OHCI controller, this option is not necessary.
 
+config USB_OHCI_EXYNOS
+       boolean "OHCI support for Samsung EXYNOS SoC Series"
+       depends on USB_OHCI_HCD && ARCH_EXYNOS
+       help
+        Enable support for the Samsung Exynos SOC's on-chip OHCI controller.
+
 config USB_CNS3XXX_OHCI
        bool "Cavium CNS3XXX OHCI Module"
        depends on USB_OHCI_HCD && ARCH_CNS3XXX