diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /arch/mips/ddb5xxx/common/prom.c | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/mips/ddb5xxx/common/prom.c')
| -rw-r--r-- | arch/mips/ddb5xxx/common/prom.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/ddb5xxx/common/prom.c b/arch/mips/ddb5xxx/common/prom.c index b8d1f7489f3b..00c62c1c28a3 100644 --- a/arch/mips/ddb5xxx/common/prom.c +++ b/arch/mips/ddb5xxx/common/prom.c | |||
| @@ -56,13 +56,7 @@ void __init prom_init(void) | |||
| 56 | 56 | ||
| 57 | mips_machgroup = MACH_GROUP_NEC_DDB; | 57 | mips_machgroup = MACH_GROUP_NEC_DDB; |
| 58 | 58 | ||
| 59 | #if defined(CONFIG_DDB5074) | 59 | #if defined(CONFIG_DDB5477) |
| 60 | mips_machtype = MACH_NEC_DDB5074; | ||
| 61 | add_memory_region(0, DDB_SDRAM_SIZE, BOOT_MEM_RAM); | ||
| 62 | #elif defined(CONFIG_DDB5476) | ||
| 63 | mips_machtype = MACH_NEC_DDB5476; | ||
| 64 | add_memory_region(0, DDB_SDRAM_SIZE, BOOT_MEM_RAM); | ||
| 65 | #elif defined(CONFIG_DDB5477) | ||
| 66 | ddb5477_runtime_detection(); | 60 | ddb5477_runtime_detection(); |
| 67 | add_memory_region(0, board_ram_size, BOOT_MEM_RAM); | 61 | add_memory_region(0, board_ram_size, BOOT_MEM_RAM); |
| 68 | #endif | 62 | #endif |