diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/mach-at91/board-ecbat91.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/arm/mach-at91/board-ecbat91.c')
| -rw-r--r-- | arch/arm/mach-at91/board-ecbat91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c index bfeee8a2af28..1d69908617f0 100644 --- a/arch/arm/mach-at91/board-ecbat91.c +++ b/arch/arm/mach-at91/board-ecbat91.c | |||
| @@ -86,7 +86,7 @@ static struct mtd_partition __initdata my_flash0_partitions[] = | |||
| 86 | { /* 0x8400 */ | 86 | { /* 0x8400 */ |
| 87 | .name = "Darrell-loader", | 87 | .name = "Darrell-loader", |
| 88 | .offset = 0, | 88 | .offset = 0, |
| 89 | .size = 12* 1056, | 89 | .size = 12 * 1056, |
| 90 | }, | 90 | }, |
| 91 | { | 91 | { |
| 92 | .name = "U-boot", | 92 | .name = "U-boot", |