Blackfin arch: only include asm/cplb.h when it is truly used

[linux-2.6-omap-h63xx.git] / arch / blackfin / mach-bf548 / boards / cm_bf548.c

diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 36f56f9ffd0550e0e4f4a86f6ff61d12d3d0739f..c5609ff805f815dff7619e912dce055626d90f46 100644 (file)
--- 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,
        },
 };