From efa497b9ec8cc534f8883a2d1d42f52174070f38 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 29 Feb 2012 13:13:53 -0600 Subject: ARM: dove: add explicit include of dove.h to addr-map.c In preparation to remove mach/io.h, add explicit include of mach/dove.h Signed-off-by: Rob Herring Acked-by: Nicolas Pitre --- arch/arm/mach-dove/addr-map.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/mach-dove') diff --git a/arch/arm/mach-dove/addr-map.c b/arch/arm/mach-dove/addr-map.c index 98b8c83b09ab..2a06c0163418 100644 --- a/arch/arm/mach-dove/addr-map.c +++ b/arch/arm/mach-dove/addr-map.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "common.h" -- cgit v1.2.3 From 5621caac1d9514b568f986b55ce5494b1d119d40 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 10 Feb 2012 20:04:56 -0600 Subject: ARM: kill off __mem_pci __mem_pci is only used to enable readl/writel and friends. Just condition this on readl being defined and remove all the __mem_pci defines. Signed-off-by: Rob Herring Cc: Russell King Cc: Lennert Buytenhek Cc: Imre Kaloz Cc: Krzysztof Halasa Cc: Nicolas Pitre Cc: Ben Dooks Cc: Kukjin Kim Cc: Colin Cross Cc: Olof Johansson Cc: Stephen Warren --- arch/arm/mach-dove/include/mach/io.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-dove') diff --git a/arch/arm/mach-dove/include/mach/io.h b/arch/arm/mach-dove/include/mach/io.h index eb4936ff90ad..29c8b85355a5 100644 --- a/arch/arm/mach-dove/include/mach/io.h +++ b/arch/arm/mach-dove/include/mach/io.h @@ -15,6 +15,5 @@ #define __io(a) ((void __iomem *)(((a) - DOVE_PCIE0_IO_BUS_BASE) + \ DOVE_PCIE0_IO_VIRT_BASE)) -#define __mem_pci(a) (a) #endif -- cgit v1.2.3