---

yaml --- r: 296267 b: refs/heads/master c: 5eca8f3 h: refs/heads/master i: 296265: 9e7b1c5 296263: f5ba9a2 v: v3
git-mirror · Feb 2, 2012 · 9083a2c · 9083a2c
1 parent bc74c80
commit 9083a2c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcbbf908e3c6d60f8efb7e2e8f09285bbda9e11e
+refs/heads/master: 5eca8f3a8048235d7fa3faa9ee4fc292d25a7425
diff --git a/trunk/arch/arm/mach-ebsa110/core.c b/trunk/arch/arm/mach-ebsa110/core.c
@@ -76,22 +76,22 @@ static struct map_desc ebsa110_io_desc[] __initdata = {
 	{	/* IRQ_STAT/IRQ_MCLR */
 		.virtual	= IRQ_STAT,
 		.pfn		= __phys_to_pfn(TRICK4_PHYS),
-		.length		= PGDIR_SIZE,
+		.length		= TRICK4_SIZE,
 		.type		= MT_DEVICE
 	}, {	/* IRQ_MASK/IRQ_MSET */
 		.virtual	= IRQ_MASK,
 		.pfn		= __phys_to_pfn(TRICK3_PHYS),
-		.length		= PGDIR_SIZE,
+		.length		= TRICK3_SIZE,
 		.type		= MT_DEVICE
 	}, {	/* SOFT_BASE */
 		.virtual	= SOFT_BASE,
 		.pfn		= __phys_to_pfn(TRICK1_PHYS),
-		.length		= PGDIR_SIZE,
+		.length		= TRICK1_SIZE,
 		.type		= MT_DEVICE
 	}, {	/* PIT_BASE */
 		.virtual	= PIT_BASE,
 		.pfn		= __phys_to_pfn(TRICK0_PHYS),
-		.length		= PGDIR_SIZE,
+		.length		= TRICK0_SIZE,
 		.type		= MT_DEVICE
 	},
 

diff --git a/trunk/arch/arm/mach-ebsa110/core.h b/trunk/arch/arm/mach-ebsa110/core.h
@@ -18,10 +18,14 @@
 #define ISAIO_SIZE		PGDIR_SIZE
 
 #define TRICK0_PHYS		0xf2000000
+#define TRICK0_SIZE		PGDIR_SIZE
 #define TRICK1_PHYS		0xf2400000
+#define TRICK1_SIZE		PGDIR_SIZE
 #define TRICK2_PHYS		0xf2800000
 #define TRICK3_PHYS		0xf2c00000
+#define TRICK3_SIZE		PGDIR_SIZE
 #define TRICK4_PHYS		0xf3000000
+#define TRICK4_SIZE		PGDIR_SIZE
 #define TRICK5_PHYS		0xf3400000
 #define TRICK6_PHYS		0xf3800000
 #define TRICK7_PHYS		0xf3c00000