diff options
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r-- | drivers/ide/ppc/Makefile | 3 | ||||
-rw-r--r-- | drivers/ide/ppc/mpc8xx.c | 6 | ||||
-rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/drivers/ide/ppc/Makefile b/drivers/ide/ppc/Makefile new file mode 100644 index 000000000000..65af5848b28c --- /dev/null +++ b/drivers/ide/ppc/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | |||
2 | obj-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o | ||
3 | obj-$(CONFIG_BLK_DEV_MPC8xx_IDE) += mpc8xx.o | ||
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c index 8172e813b034..3fd5d45b5e0e 100644 --- a/drivers/ide/ppc/mpc8xx.c +++ b/drivers/ide/ppc/mpc8xx.c | |||
@@ -839,7 +839,7 @@ void m8xx_ide_init(void) | |||
839 | ppc_ide_md.ide_init_hwif = m8xx_ide_init_hwif_ports; | 839 | ppc_ide_md.ide_init_hwif = m8xx_ide_init_hwif_ports; |
840 | } | 840 | } |
841 | 841 | ||
842 | void __init mpc8xx_ide_probe(void) | 842 | static int __init mpc8xx_ide_probe(void) |
843 | { | 843 | { |
844 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 844 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
845 | 845 | ||
@@ -851,4 +851,8 @@ void __init mpc8xx_ide_probe(void) | |||
851 | #endif | 851 | #endif |
852 | 852 | ||
853 | ide_device_add(idx); | 853 | ide_device_add(idx); |
854 | |||
855 | return 0; | ||
854 | } | 856 | } |
857 | |||
858 | module_init(mpc8xx_ide_probe); | ||
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 36e4b9570746..cd514743df96 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1786,3 +1786,5 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1786 | } | 1786 | } |
1787 | 1787 | ||
1788 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ | 1788 | #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ |
1789 | |||
1790 | module_init(pmac_ide_probe); | ||