diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-13 12:36:37 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-18 09:49:57 -0400 |
| commit | b4811bacbc68f6e17d442df88f98afaa9394d4f5 (patch) | |
| tree | ca294ae0bc71b7e6d28985714372bb9164574a78 /arch/arm/mach-footbridge | |
| parent | ace71f49da19169132a02ecd92f859a8589f2527 (diff) | |
ARM: fix CONFIG_VIRT_TO_BUS handling
887cbce0 "arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS"
and 4febd95a8 "Select VIRT_TO_BUS directly where needed" from
Stephen Rothwell changed globally how CONFIG_VIRT_TO_BUS is
selected, while my own a5d533ee0 "ARM: disable virt_to_bus/
virt_to_bus almost everywhere" was merged at the same time and
changed which platforms select it on ARM.
The result of this conflict was that we again see CONFIG_VIRT_TO_BUS
on all ARM systems. This patch fixes up the problem and removes
CONFIG_ARCH_NO_VIRT_TO_BUS again on ARM.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/arm/mach-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index abda5a18a664..0f2111a11315 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig | |||
| @@ -67,6 +67,7 @@ config ARCH_NETWINDER | |||
| 67 | select ISA | 67 | select ISA |
| 68 | select ISA_DMA | 68 | select ISA_DMA |
| 69 | select PCI | 69 | select PCI |
| 70 | select VIRT_TO_BUS | ||
| 70 | help | 71 | help |
| 71 | Say Y here if you intend to run this kernel on the Rebel.COM | 72 | Say Y here if you intend to run this kernel on the Rebel.COM |
| 72 | NetWinder. Information about this machine can be found at: | 73 | NetWinder. Information about this machine can be found at: |