ARM: fix CONFIG_VIRT_TO_BUS handling
authorArnd Bergmann <arnd@arndb.de>
Wed, 13 Mar 2013 16:36:37 +0000 (17:36 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 18 Mar 2013 13:49:57 +0000 (13:49 +0000)
commitb4811bacbc68f6e17d442df88f98afaa9394d4f5
treeca294ae0bc71b7e6d28985714372bb9164574a78
parentace71f49da19169132a02ecd92f859a8589f2527
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>
arch/arm/Kconfig
arch/arm/mach-footbridge/Kconfig