projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...
[powerpc.git]
/
drivers
/
usb
/
Kconfig
diff --git
a/drivers/usb/Kconfig
b/drivers/usb/Kconfig
index
f9b1719
..
15499b7
100644
(file)
--- a/
drivers/usb/Kconfig
+++ b/
drivers/usb/Kconfig
@@
-3,6
+3,7
@@
#
menu "USB support"
#
menu "USB support"
+ depends on HAS_IOMEM
# Host-side USB depends on having a host controller
# NOTE: dummy_hcd is always an option, but it's ignored here ...
# Host-side USB depends on having a host controller
# NOTE: dummy_hcd is always an option, but it's ignored here ...
@@
-24,7
+25,7
@@
config USB_ARCH_HAS_OHCI
default y if ARCH_S3C2410
default y if PXA27x
default y if ARCH_EP93XX
default y if ARCH_S3C2410
default y if PXA27x
default y if ARCH_EP93XX
- default y if
(ARCH_AT91RM9200 || ARCH_AT91SAM9261)
+ default y if
ARCH_AT91
default y if ARCH_PNX4008
# PPC:
default y if STB03xxx
default y if ARCH_PNX4008
# PPC:
default y if STB03xxx
@@
-85,12
+86,8
@@
source "drivers/usb/class/Kconfig"
source "drivers/usb/storage/Kconfig"
source "drivers/usb/storage/Kconfig"
-source "drivers/usb/input/Kconfig"
-
source "drivers/usb/image/Kconfig"
source "drivers/usb/image/Kconfig"
-source "drivers/usb/net/Kconfig"
-
source "drivers/usb/mon/Kconfig"
comment "USB port drivers"
source "drivers/usb/mon/Kconfig"
comment "USB port drivers"