From a6789e2fa611c495ba4b6c0d9ca8e523a09d8a68 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Mon, 13 Oct 2008 14:45:21 +0800
Subject: [PATCH] --- yaml --- r: 113737 b: refs/heads/master c:
 f4585a08479a730fb809606b8ee327a5398c117c h: refs/heads/master i:   113735:
 fc6bca5c60d329d65bc48adb09b1fcf2b34fd44a v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/blackfin/include/asm/cacheflush.h     | 2 --
 trunk/arch/blackfin/kernel/traps.c               | 1 +
 trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c | 3 +--
 trunk/arch/blackfin/mach-bf527/boards/ezkit.c    | 3 +--
 trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c | 7 +++----
 trunk/arch/blackfin/mach-bf548/boards/ezkit.c    | 3 +--
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2defe024af59..071faf3fcce3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ffb9bef23d283e0e94c73e6683a6591ba3b0888
+refs/heads/master: f4585a08479a730fb809606b8ee327a5398c117c
diff --git a/trunk/arch/blackfin/include/asm/cacheflush.h b/trunk/arch/blackfin/include/asm/cacheflush.h
index d81a77545a04..5ef9e35e9c3b 100644
--- a/trunk/arch/blackfin/include/asm/cacheflush.h
+++ b/trunk/arch/blackfin/include/asm/cacheflush.h
@@ -30,8 +30,6 @@
 #ifndef _BLACKFIN_CACHEFLUSH_H
 #define _BLACKFIN_CACHEFLUSH_H
 
-#include <asm/cplb.h>
-
 extern void blackfin_icache_dcache_flush_range(unsigned int, unsigned int);
 extern void blackfin_icache_flush_range(unsigned int, unsigned int);
 extern void blackfin_dcache_flush_range(unsigned int, unsigned int);
diff --git a/trunk/arch/blackfin/kernel/traps.c b/trunk/arch/blackfin/kernel/traps.c
index 9a9d5083acfd..fd24e04fc19e 100644
--- a/trunk/arch/blackfin/kernel/traps.c
+++ b/trunk/arch/blackfin/kernel/traps.c
@@ -34,6 +34,7 @@
 #include <linux/fs.h>
 #include <asm/traps.h>
 #include <asm/cacheflush.h>
+#include <asm/cplb.h>
 #include <asm/blackfin.h>
 #include <asm/irq_handler.h>
 #include <linux/irq.h>
diff --git a/trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c b/trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 986483fb69fa..9ea440bbb13d 100644
--- a/trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -44,7 +44,6 @@
 #include <linux/interrupt.h>
 #include <linux/usb/sl811.h>
 #include <linux/usb/musb.h>
-#include <asm/cplb.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/reboot.h>
@@ -209,7 +208,7 @@ static struct mtd_partition partition_info[] = {
 	{
 		.name = "linux kernel(nand)",
 		.offset = 0,
-		.size = 4 * SIZE_1M,
+		.size = 4 * 1024 * 1024,
 	},
 	{
 		.name = "file system(nand)",
diff --git a/trunk/arch/blackfin/mach-bf527/boards/ezkit.c b/trunk/arch/blackfin/mach-bf527/boards/ezkit.c
index a756934482cf..04a8d6da9055 100644
--- a/trunk/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/trunk/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -43,7 +43,6 @@
 #include <linux/interrupt.h>
 #include <linux/usb/sl811.h>
 #include <linux/usb/musb.h>
-#include <asm/cplb.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/reboot.h>
@@ -226,7 +225,7 @@ static struct mtd_partition partition_info[] = {
 	{
 		.name = "linux kernel(nand)",
 		.offset = 0,
-		.size = 4 * SIZE_1M,
+		.size = 4 * 1024 * 1024,
 	},
 	{
 		.name = "file system(nand)",
diff --git a/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c b/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 36f56f9ffd05..c5609ff805f8 100644
--- a/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/trunk/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -38,7 +38,6 @@
 #include <linux/interrupt.h>
 #include <linux/usb/musb.h>
 #include <asm/bfin5xx_spi.h>
-#include <asm/cplb.h>
 #include <asm/dma.h>
 #include <asm/gpio.h>
 #include <asm/nand.h>
@@ -329,12 +328,12 @@ static struct mtd_partition partition_info[] = {
 	{
 		.name = "linux kernel(nand)",
 		.offset = 0,
-		.size = 4 * SIZE_1M,
+		.size = 4 * 1024 * 1024,
 	},
 	{
 		.name = "file system(nand)",
-		.offset = 4 * SIZE_1M,
-		.size = (256 - 4) * SIZE_1M,
+		.offset = 4 * 1024 * 1024,
+		.size = (256 - 4) * 1024 * 1024,
 	},
 };
 
diff --git a/trunk/arch/blackfin/mach-bf548/boards/ezkit.c b/trunk/arch/blackfin/mach-bf548/boards/ezkit.c
index 628f21889e22..397ddf6b8106 100644
--- a/trunk/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/trunk/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -40,7 +40,6 @@
 #include <linux/interrupt.h>
 #include <linux/usb/musb.h>
 #include <asm/bfin5xx_spi.h>
-#include <asm/cplb.h>
 #include <asm/dma.h>
 #include <asm/gpio.h>
 #include <asm/nand.h>
@@ -375,7 +374,7 @@ static struct mtd_partition partition_info[] = {
 	{
 		.name = "linux kernel(nand)",
 		.offset = 0,
-		.size = 4 * SIZE_1M,
+		.size = 4 * 1024 * 1024,
 	},
 	{
 		.name = "file system(nand)",