Commit b4811bac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: fix CONFIG_VIRT_TO_BUS handling 



887cbce0 "arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS"
and  4febd95a "Select VIRT_TO_BUS directly where needed" from
Stephen Rothwell changed globally how CONFIG_VIRT_TO_BUS is
selected, while my own a5d533ee "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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
parent ace71f49

arch/arm/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ config ARM 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16

	select HAVE_VIRT_TO_BUS

	select KTIME_SCALAR

	select PERF_USE_VMALLOC

	select RTC_LIB
@@ -743,6 +742,7 @@ config ARCH_RPC 
	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H

	select NO_IOPORT

	select VIRT_TO_BUS

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -878,6 +878,7 @@ config ARCH_SHARK 
	select ISA_DMA

	select NEED_MACH_MEMORY_H

	select PCI

	select VIRT_TO_BUS

	select ZONE_DMA

	help

	  Support for the StrongARM based Digital DNARD machine, also known
@@ -1461,10 +1462,6 @@ config ISA_DMA 
	bool

	select ISA_DMA_API



config ARCH_NO_VIRT_TO_BUS

	def_bool y

	depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK



# Select ISA DMA interface

config ISA_DMA_API

	bool

arch/arm/mach-footbridge/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ config ARCH_NETWINDER 
	select ISA

	select ISA_DMA

	select PCI

	select VIRT_TO_BUS

	help

	  Say Y here if you intend to run this kernel on the Rebel.COM

	  NetWinder.  Information about this machine can be found at:

CRA Git | Maintained and supported by SUSTech CRA and CCSE