diff options
| -rw-r--r-- | arch/parisc/include/asm/processor.h | 1 | ||||
| -rw-r--r-- | arch/parisc/kernel/setup.c | 3 | ||||
| -rw-r--r-- | drivers/parisc/eisa.c | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h index e0386767c0a4..b3db85b71e8b 100644 --- a/arch/parisc/include/asm/processor.h +++ b/arch/parisc/include/asm/processor.h @@ -319,7 +319,6 @@ extern void ccio_init(void); extern void iosapic_init(void); extern void lba_init(void); extern void sba_init(void); -extern void parisc_eisa_init(void); struct parisc_device; struct resource; extern void sba_distributed_lmmio(struct parisc_device *, struct resource *); diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 795486f0a1ea..733a9010f370 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -303,9 +303,6 @@ static int __init parisc_init(void) #if defined(CONFIG_GSC_LASI) || defined(CONFIG_GSC_WAX) gsc_init(); #endif -#ifdef CONFIG_EISA - parisc_eisa_init(); -#endif #ifdef CONFIG_CHASSIS_LCD_LED register_led_regions(); /* register LED port info in procfs */ diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 45e487388c6e..9eab974e6baf 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c @@ -400,10 +400,11 @@ static struct parisc_driver eisa_driver __refdata = { .probe = eisa_probe, }; -void __init parisc_eisa_init(void) +static int __init parisc_eisa_init(void) { - register_parisc_driver(&eisa_driver); + return register_parisc_driver(&eisa_driver); } +arch_initcall(parisc_eisa_init); static unsigned int eisa_irq_configured; |