diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /arch/ppc/kernel/setup.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'arch/ppc/kernel/setup.c')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 3fdb35718..a0d67c98e 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c @@ -80,6 +80,9 @@ int _machine = 0; int have_of = 0; int is_prep = 0; int is_chrp = 0; +#ifdef CONFIG_MAGIC_SYSRQ +unsigned long SYSRQ_KEY; +#endif /* CONFIG_MAGIC_SYSRQ */ /* For MTX/MVME boards.. with Raven/Falcon Chipset Real close to CHRP, but boot like PReP (via PPCbug) There's probably a nicer way to do this.. --Troy */ @@ -160,15 +163,6 @@ void machine_halt(void) ppc_md.halt(); } -#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) -void ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq) -{ - if (ppc_ide_md.ide_init_hwif != NULL) { - ppc_ide_md.ide_init_hwif(hw, data_port, ctrl_port, irq); - } -} -#endif - unsigned long cpu_temp(void) { unsigned char thres = 0; @@ -376,7 +370,6 @@ identify_machine(unsigned long r3, unsigned long r4, unsigned long r5, else { _machine = _MACH_Pmac; - is_prep = 1; } } |