diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/arm/mach-pxa/eseries.c | |
| parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
| parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/arm/mach-pxa/eseries.c')
| -rw-r--r-- | arch/arm/mach-pxa/eseries.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index 96ed13081639..a0ab3082a000 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
| @@ -34,7 +34,6 @@ void __init eseries_fixup(struct machine_desc *desc, | |||
| 34 | { | 34 | { |
| 35 | mi->nr_banks=1; | 35 | mi->nr_banks=1; |
| 36 | mi->bank[0].start = 0xa0000000; | 36 | mi->bank[0].start = 0xa0000000; |
| 37 | mi->bank[0].node = 0; | ||
| 38 | if (machine_is_e800()) | 37 | if (machine_is_e800()) |
| 39 | mi->bank[0].size = (128*1024*1024); | 38 | mi->bank[0].size = (128*1024*1024); |
| 40 | else | 39 | else |