diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-13 16:36:37 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-18 13:49:57 (GMT) |
| commit | b4811bacbc68f6e17d442df88f98afaa9394d4f5 (patch) | |
| tree | ca294ae0bc71b7e6d28985714372bb9164574a78 /fs/ocfs2/alloc.c | |
| parent | ace71f49da19169132a02ecd92f859a8589f2527 (diff) | |
| download | linux-fsl-qoriq-b4811bacbc68f6e17d442df88f98afaa9394d4f5.tar.xz | |
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 'fs/ocfs2/alloc.c')
0 files changed, 0 insertions, 0 deletions