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>

2 files changed, 4 insertions, 6 deletions

diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 36f56f9ffd05..c5609ff805f8 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/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/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 628f21889e22..397ddf6b8106 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/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)",