diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /arch/powerpc/platforms/85xx/mpc85xx_mds.c | |
parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_mds.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_mds.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index 04ed2156db1c..f0684c8ac960 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
@@ -326,11 +326,14 @@ static struct of_device_id mpc85xx_ids[] = { | |||
326 | { .compatible = "gianfar", }, | 326 | { .compatible = "gianfar", }, |
327 | { .compatible = "fsl,rapidio-delta", }, | 327 | { .compatible = "fsl,rapidio-delta", }, |
328 | { .compatible = "fsl,mpc8548-guts", }, | 328 | { .compatible = "fsl,mpc8548-guts", }, |
329 | { .compatible = "gpio-leds", }, | ||
329 | {}, | 330 | {}, |
330 | }; | 331 | }; |
331 | 332 | ||
332 | static int __init mpc85xx_publish_devices(void) | 333 | static int __init mpc85xx_publish_devices(void) |
333 | { | 334 | { |
335 | if (machine_is(mpc8568_mds)) | ||
336 | simple_gpiochip_init("fsl,mpc8568mds-bcsr-gpio"); | ||
334 | if (machine_is(mpc8569_mds)) | 337 | if (machine_is(mpc8569_mds)) |
335 | simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio"); | 338 | simple_gpiochip_init("fsl,mpc8569mds-bcsr-gpio"); |
336 | 339 | ||
@@ -362,7 +365,8 @@ static void __init mpc85xx_mds_pic_init(void) | |||
362 | } | 365 | } |
363 | 366 | ||
364 | mpic = mpic_alloc(np, r.start, | 367 | mpic = mpic_alloc(np, r.start, |
365 | MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN, | 368 | MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | |
369 | MPIC_BROKEN_FRR_NIRQS, | ||
366 | 0, 256, " OpenPIC "); | 370 | 0, 256, " OpenPIC "); |
367 | BUG_ON(mpic == NULL); | 371 | BUG_ON(mpic == NULL); |
368 | of_node_put(np); | 372 | of_node_put(np); |