From f4585a08479a730fb809606b8ee327a5398c117c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Mon, 13 Oct 2008 14:45:21 +0800
Subject: Blackfin arch: only include asm/cplb.h when it is truly used

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
 arch/blackfin/mach-bf527/boards/cm_bf527.c | 3 +--
 arch/blackfin/mach-bf527/boards/ezkit.c    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'arch/blackfin/mach-bf527')

diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 986483fb69f..9ea440bbb13 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/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/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index a756934482c..04a8d6da905 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/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)",
-- 
cgit v1.2.3