diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-23 10:55:20 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-23 10:55:20 +1000 |
| commit | aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d (patch) | |
| tree | aac7ff987592f8040ce68d5a28ece5fa4cb0fc50 /arch/powerpc/platforms/85xx/mpc85xx_mds.c | |
| parent | 932e9f352b5d685725076f21b237f7c7d804b29c (diff) | |
| parent | 4351f30a35b8c6a6b6d4d36e5c2dc8ec0262b2ca (diff) | |
| download | blackbird-op-linux-aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d.tar.gz blackbird-op-linux-aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d.zip | |
Merge remote-tracking branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_mds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_mds.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 9a6f04406e0d..d208ebccb91c 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -399,12 +399,6 @@ static int __init board_fixups(void) machine_arch_initcall(mpc8568_mds, board_fixups); machine_arch_initcall(mpc8569_mds, board_fixups); -static struct of_device_id mpc85xx_ids[] = { - { .compatible = "fsl,mpc8548-guts", }, - { .compatible = "gpio-leds", }, - {}, -}; - static int __init mpc85xx_publish_devices(void) { if (machine_is(mpc8568_mds)) @@ -412,10 +406,7 @@ static int __init mpc85xx_publish_devices(void) if (machine_is(mpc8569_mds)) simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio"); - mpc85xx_common_publish_devices(); - of_platform_bus_probe(NULL, mpc85xx_ids, NULL); - - return 0; + return mpc85xx_common_publish_devices(); } machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices); |
