diff options
author | David Daney <david.daney@cavium.com> | 2013-08-09 21:17:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 15:18:38 -0400 |
commit | 900e06212df8bc20bcdcf3b71b4e2909287ce257 (patch) | |
tree | 42f4cde8c37d5927e7ad58ef1041c07d1f89f992 /drivers/usb | |
parent | cffedd6794bb32c4fbc03600fac61beca7950f08 (diff) |
usb: Move definition of USB_EHCI_BIG_ENDIAN_MMIO et al. out side of the ifs.
When CONFIG_USB_SUPPORT is not selected we get things like:
scripts/kconfig/mconf Kconfig
warning: (MIPS_SEAD3 && PMC_MSP && CPU_CAVIUM_OCTEON) selects USB_EHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
It is much cleaner to make the various system Kconfigs select
USB_EHCI_BIG_ENDIAN_MMIO rather than move the system config
information into USB's Kconfig, but the warnings are annoying.
Eliminate the warning by moving the definition of
USB_EHCI_BIG_ENDIAN_MMIO outside of all the Kconfig if statements.
While we are at it move USB_OHCI_BIG_ENDIAN_DESC,
USB_OHCI_BIG_ENDIAN_MMIO, USB_OHCI_LITTLE_ENDIAN and
USB_EHCI_BIG_ENDIAN_DESC too, as they could very well suffer similar
problems for other systems.
Get rid of the redundant "default n" in USB_OHCI_BIG_ENDIAN_DESC and
USB_OHCI_BIG_ENDIAN_MMIO
Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/Kconfig | 17 | ||||
-rw-r--r-- | drivers/usb/host/Kconfig | 20 |
2 files changed, 17 insertions, 20 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 73f62caa8609..2642b8a11e05 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -6,9 +6,26 @@ | |||
6 | config USB_ARCH_HAS_OHCI | 6 | config USB_ARCH_HAS_OHCI |
7 | bool | 7 | bool |
8 | 8 | ||
9 | config USB_OHCI_BIG_ENDIAN_DESC | ||
10 | bool | ||
11 | |||
12 | config USB_OHCI_BIG_ENDIAN_MMIO | ||
13 | bool | ||
14 | |||
15 | config USB_OHCI_LITTLE_ENDIAN | ||
16 | bool | ||
17 | default n if STB03xxx || PPC_MPC52xx | ||
18 | default y | ||
19 | |||
9 | config USB_ARCH_HAS_EHCI | 20 | config USB_ARCH_HAS_EHCI |
10 | bool | 21 | bool |
11 | 22 | ||
23 | config USB_EHCI_BIG_ENDIAN_MMIO | ||
24 | bool | ||
25 | |||
26 | config USB_EHCI_BIG_ENDIAN_DESC | ||
27 | bool | ||
28 | |||
12 | config USB_ARCH_HAS_XHCI | 29 | config USB_ARCH_HAS_XHCI |
13 | bool | 30 | bool |
14 | 31 | ||
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index cf521d6551dd..0947aac857a2 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -113,12 +113,6 @@ config USB_EHCI_HCD_PMC_MSP | |||
113 | Enables support for the onchip USB controller on the PMC_MSP7100 Family SoC's. | 113 | Enables support for the onchip USB controller on the PMC_MSP7100 Family SoC's. |
114 | If unsure, say N. | 114 | If unsure, say N. |
115 | 115 | ||
116 | config USB_EHCI_BIG_ENDIAN_MMIO | ||
117 | bool | ||
118 | |||
119 | config USB_EHCI_BIG_ENDIAN_DESC | ||
120 | bool | ||
121 | |||
122 | config XPS_USB_HCD_XILINX | 116 | config XPS_USB_HCD_XILINX |
123 | bool "Use Xilinx usb host EHCI controller core" | 117 | bool "Use Xilinx usb host EHCI controller core" |
124 | depends on (PPC32 || MICROBLAZE) | 118 | depends on (PPC32 || MICROBLAZE) |
@@ -509,20 +503,6 @@ config USB_OCTEON_OHCI | |||
509 | controller. It is needed for low-speed USB 1.0 device | 503 | controller. It is needed for low-speed USB 1.0 device |
510 | support. All CN6XXX based chips with USB are supported. | 504 | support. All CN6XXX based chips with USB are supported. |
511 | 505 | ||
512 | |||
513 | config USB_OHCI_BIG_ENDIAN_DESC | ||
514 | bool | ||
515 | default n | ||
516 | |||
517 | config USB_OHCI_BIG_ENDIAN_MMIO | ||
518 | bool | ||
519 | default n | ||
520 | |||
521 | config USB_OHCI_LITTLE_ENDIAN | ||
522 | bool | ||
523 | default n if STB03xxx || PPC_MPC52xx | ||
524 | default y | ||
525 | |||
526 | endif # USB_OHCI_HCD | 506 | endif # USB_OHCI_HCD |
527 | 507 | ||
528 | config USB_UHCI_HCD | 508 | config USB_UHCI_HCD |