Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio

[deliverable/linux.git] / arch / arm / mach-bcm2835 / bcm2835.c

diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index 6f5785985dd1f727e4a062a97eeb39e8d9c86568..740fa9ebe249ab14de612aefb0e24612a1877757 100644 (file)
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -23,8 +23,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/bcm2835_soc.h>
-
 #define PM_RSTC                                0x1c
 #define PM_RSTS                                0x20
 #define PM_WDOG                                0x24
@@ -34,6 +32,10 @@
 #define PM_RSTC_WRCFG_FULL_RESET       0x00000020
 #define PM_RSTS_HADWRH_SET             0x00000040
 
+#define BCM2835_PERIPH_PHYS    0x20000000
+#define BCM2835_PERIPH_VIRT    0xf0000000
+#define BCM2835_PERIPH_SIZE    SZ_16M
+
 static void __iomem *wdt_regs;
 
 /*