From 1ec3edfb664d51c91b401cd49209044fec45bc98 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 13 Mar 2013 17:36:37 +0100 Subject: [PATCH] --- yaml --- r: 361401 b: refs/heads/master c: b4811bacbc68f6e17d442df88f98afaa9394d4f5 h: refs/heads/master i: 361399: 6f17b07adb631cb8550b0691cf68b2cd89f4176a v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 7 ++----- trunk/arch/arm/mach-footbridge/Kconfig | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f6d97c1c63fd..17612c9e2c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ace71f49da19169132a02ecd92f859a8589f2527 +refs/heads/master: b4811bacbc68f6e17d442df88f98afaa9394d4f5 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index ca1b6fd94a3f..6d6e77c89691 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -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 diff --git a/trunk/arch/arm/mach-footbridge/Kconfig b/trunk/arch/arm/mach-footbridge/Kconfig index abda5a18a664..0f2111a11315 100644 --- a/trunk/arch/arm/mach-footbridge/Kconfig +++ b/trunk/arch/arm/mach-footbridge/Kconfig @@ -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: