diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
| commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
| tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /arch/arm/mach-gemini/board-wbd111.c | |
| parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-gemini/board-wbd111.c')
| -rw-r--r-- | arch/arm/mach-gemini/board-wbd111.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c index af7b68a6b258..88cc422ee444 100644 --- a/arch/arm/mach-gemini/board-wbd111.c +++ b/arch/arm/mach-gemini/board-wbd111.c | |||
| @@ -84,7 +84,6 @@ static struct sys_timer wbd111_timer = { | |||
| 84 | .init = gemini_timer_init, | 84 | .init = gemini_timer_init, |
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | #ifdef CONFIG_MTD_PARTITIONS | ||
| 88 | static struct mtd_partition wbd111_partitions[] = { | 87 | static struct mtd_partition wbd111_partitions[] = { |
| 89 | { | 88 | { |
| 90 | .name = "RedBoot", | 89 | .name = "RedBoot", |
| @@ -116,11 +115,7 @@ static struct mtd_partition wbd111_partitions[] = { | |||
| 116 | .mask_flags = MTD_WRITEABLE, | 115 | .mask_flags = MTD_WRITEABLE, |
| 117 | } | 116 | } |
| 118 | }; | 117 | }; |
| 119 | #define wbd111_num_partitions ARRAY_SIZE(wbd111_partitions) | 118 | #define wbd111_num_partitions ARRAY_SIZE(wbd111_partitions) |
| 120 | #else | ||
| 121 | #define wbd111_partitions NULL | ||
| 122 | #define wbd111_num_partitions 0 | ||
| 123 | #endif /* CONFIG_MTD_PARTITIONS */ | ||
| 124 | 119 | ||
| 125 | static void __init wbd111_init(void) | 120 | static void __init wbd111_init(void) |
| 126 | { | 121 | { |