[PATCH 2/7] ARM: dma-mapping: simplify page_to_dma() and __pfn_to_bus()

[anders.grafstrom@netinsight.net (Anders Grafström)]

Russell King - ARM Linux wrote:
> The non-highmem() and the __pfn_to_bus() based page_to_dma() both
> compile to the same code, so its pointless having these two different
> approaches.  Use the __pfn_to_bus() based version.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
>  arch/arm/include/asm/dma-mapping.h |   10 ----------
>  arch/arm/include/asm/memory.h      |    3 ++-
>  2 files changed, 2 insertions(+), 11 deletions(-)

footbridge doesn't build after this.
Could something like the patch below be in order?

diff --git a/arch/arm/mach-footbridge/include/mach/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h
index cb16e59..cd23276 100644
--- a/arch/arm/mach-footbridge/include/mach/memory.h
+++ b/arch/arm/mach-footbridge/include/mach/memory.h
@@ -51,6 +51,9 @@ extern unsigned long __bus_to_virt(unsigned long);
 
 #endif
 
+#define __pfn_to_bus(x)		__pfn_to_phys(x)
+#define __bus_to_pfn(x)		__phys_to_pfn(x)
+
 /*
  * Cache flushing area.
  */