diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/ppc/kernel/prep_setup.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/ppc/kernel/prep_setup.c')
| -rw-r--r-- | arch/ppc/kernel/prep_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/kernel/prep_setup.c b/arch/ppc/kernel/prep_setup.c index 19ae61450..cb1110eca 100644 --- a/arch/ppc/kernel/prep_setup.c +++ b/arch/ppc/kernel/prep_setup.c @@ -118,7 +118,7 @@ prep_get_cpuinfo(char *buffer) extern char *Motherboard_map_name; int len, i; -#ifdef __SMP__ +#ifdef CONFIG_SMP #define CD(X) (cpu_data[n].X) #else #define CD(X) (X) @@ -624,10 +624,10 @@ prep_init_IRQ(void) for ( i = 0 ; i < 16 ; i++ ) irq_desc[i].handler = &i8259_pic; i8259_init(); -#ifdef __SMP__ +#ifdef CONFIG_SMP request_irq(openpic_to_irq(OPENPIC_VEC_SPURIOUS), openpic_ipi_action, 0, "IPI0", 0); -#endif /* __SMP__ */ +#endif /* CONFIG_SMP */ } #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) |