diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-10-13 02:45:21 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-10-13 02:45:21 -0400 |
commit | f4585a08479a730fb809606b8ee327a5398c117c (patch) | |
tree | beca2187ebd86bae26321288ec8af33f02222c07 /arch/blackfin/mach-bf548/boards | |
parent | 1ffb9bef23d283e0e94c73e6683a6591ba3b0888 (diff) |
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>
Diffstat (limited to 'arch/blackfin/mach-bf548/boards')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 7 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 3 |
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 @@ | |||
38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/usb/musb.h> | 39 | #include <linux/usb/musb.h> |
40 | #include <asm/bfin5xx_spi.h> | 40 | #include <asm/bfin5xx_spi.h> |
41 | #include <asm/cplb.h> | ||
42 | #include <asm/dma.h> | 41 | #include <asm/dma.h> |
43 | #include <asm/gpio.h> | 42 | #include <asm/gpio.h> |
44 | #include <asm/nand.h> | 43 | #include <asm/nand.h> |
@@ -329,12 +328,12 @@ static struct mtd_partition partition_info[] = { | |||
329 | { | 328 | { |
330 | .name = "linux kernel(nand)", | 329 | .name = "linux kernel(nand)", |
331 | .offset = 0, | 330 | .offset = 0, |
332 | .size = 4 * SIZE_1M, | 331 | .size = 4 * 1024 * 1024, |
333 | }, | 332 | }, |
334 | { | 333 | { |
335 | .name = "file system(nand)", | 334 | .name = "file system(nand)", |
336 | .offset = 4 * SIZE_1M, | 335 | .offset = 4 * 1024 * 1024, |
337 | .size = (256 - 4) * SIZE_1M, | 336 | .size = (256 - 4) * 1024 * 1024, |
338 | }, | 337 | }, |
339 | }; | 338 | }; |
340 | 339 | ||
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 @@ | |||
40 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
41 | #include <linux/usb/musb.h> | 41 | #include <linux/usb/musb.h> |
42 | #include <asm/bfin5xx_spi.h> | 42 | #include <asm/bfin5xx_spi.h> |
43 | #include <asm/cplb.h> | ||
44 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
45 | #include <asm/gpio.h> | 44 | #include <asm/gpio.h> |
46 | #include <asm/nand.h> | 45 | #include <asm/nand.h> |
@@ -375,7 +374,7 @@ static struct mtd_partition partition_info[] = { | |||
375 | { | 374 | { |
376 | .name = "linux kernel(nand)", | 375 | .name = "linux kernel(nand)", |
377 | .offset = 0, | 376 | .offset = 0, |
378 | .size = 4 * SIZE_1M, | 377 | .size = 4 * 1024 * 1024, |
379 | }, | 378 | }, |
380 | { | 379 | { |
381 | .name = "file system(nand)", | 380 | .name = "file system(nand)", |