diff options
author | James Morris <jmorris@namei.org> | 2008-08-28 00:47:34 (GMT) |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-08-28 00:47:34 (GMT) |
commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /drivers/usb/Kconfig | |
parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
download | linux-fsl-qoriq-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'drivers/usb/Kconfig')
-rw-r--r-- | drivers/usb/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 755823c..bcefbdd 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -95,16 +95,18 @@ config USB source "drivers/usb/core/Kconfig" +source "drivers/usb/mon/Kconfig" + source "drivers/usb/host/Kconfig" +source "drivers/usb/musb/Kconfig" + source "drivers/usb/class/Kconfig" source "drivers/usb/storage/Kconfig" source "drivers/usb/image/Kconfig" -source "drivers/usb/mon/Kconfig" - comment "USB port drivers" depends on USB |