Commit f4585a08 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu

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

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 1ffb9bef
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#ifndef _BLACKFIN_CACHEFLUSH_H #ifndef _BLACKFIN_CACHEFLUSH_H
#define _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_dcache_flush_range(unsigned int, unsigned int);
extern void blackfin_icache_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); extern void blackfin_dcache_flush_range(unsigned int, unsigned int);
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/cplb.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include <asm/irq_handler.h> #include <asm/irq_handler.h>
#include <linux/irq.h> #include <linux/irq.h>
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb/sl811.h> #include <linux/usb/sl811.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
#include <asm/cplb.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
...@@ -209,7 +208,7 @@ static struct mtd_partition partition_info[] = { ...@@ -209,7 +208,7 @@ static struct mtd_partition partition_info[] = {
{ {
.name = "linux kernel(nand)", .name = "linux kernel(nand)",
.offset = 0, .offset = 0,
.size = 4 * SIZE_1M, .size = 4 * 1024 * 1024,
}, },
{ {
.name = "file system(nand)", .name = "file system(nand)",
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb/sl811.h> #include <linux/usb/sl811.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
#include <asm/cplb.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/reboot.h> #include <asm/reboot.h>
...@@ -226,7 +225,7 @@ static struct mtd_partition partition_info[] = { ...@@ -226,7 +225,7 @@ static struct mtd_partition partition_info[] = {
{ {
.name = "linux kernel(nand)", .name = "linux kernel(nand)",
.offset = 0, .offset = 0,
.size = 4 * SIZE_1M, .size = 4 * 1024 * 1024,
}, },
{ {
.name = "file system(nand)", .name = "file system(nand)",
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/cplb.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/nand.h> #include <asm/nand.h>
...@@ -329,12 +328,12 @@ static struct mtd_partition partition_info[] = { ...@@ -329,12 +328,12 @@ static struct mtd_partition partition_info[] = {
{ {
.name = "linux kernel(nand)", .name = "linux kernel(nand)",
.offset = 0, .offset = 0,
.size = 4 * SIZE_1M, .size = 4 * 1024 * 1024,
}, },
{ {
.name = "file system(nand)", .name = "file system(nand)",
.offset = 4 * SIZE_1M, .offset = 4 * 1024 * 1024,
.size = (256 - 4) * SIZE_1M, .size = (256 - 4) * 1024 * 1024,
}, },
}; };
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
#include <asm/bfin5xx_spi.h> #include <asm/bfin5xx_spi.h>
#include <asm/cplb.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/nand.h> #include <asm/nand.h>
...@@ -375,7 +374,7 @@ static struct mtd_partition partition_info[] = { ...@@ -375,7 +374,7 @@ static struct mtd_partition partition_info[] = {
{ {
.name = "linux kernel(nand)", .name = "linux kernel(nand)",
.offset = 0, .offset = 0,
.size = 4 * SIZE_1M, .size = 4 * 1024 * 1024,
}, },
{ {
.name = "file system(nand)", .name = "file system(nand)",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment