diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/mips/jazz | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/mips/jazz')
| -rw-r--r-- | arch/mips/jazz/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index a7947199c99b..f60524e8bc44 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
| @@ -76,10 +76,8 @@ void __init plat_mem_setup(void) | |||
| 76 | 76 | ||
| 77 | set_io_port_base(JAZZ_PORT_BASE); | 77 | set_io_port_base(JAZZ_PORT_BASE); |
| 78 | #ifdef CONFIG_EISA | 78 | #ifdef CONFIG_EISA |
| 79 | if (mips_machtype == MACH_MIPS_MAGNUM_4000) | 79 | EISA_bus = 1; |
| 80 | EISA_bus = 1; | ||
| 81 | #endif | 80 | #endif |
| 82 | isa_slot_offset = 0xe3000000; | ||
| 83 | 81 | ||
| 84 | /* request I/O space for devices used on all i[345]86 PCs */ | 82 | /* request I/O space for devices used on all i[345]86 PCs */ |
| 85 | for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++) | 83 | for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++) |