diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /arch/powerpc/platforms/83xx | |
parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/platforms/83xx')
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c index 0b4f883b20eb..ae525e4745d2 100644 --- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c | |||
@@ -74,6 +74,7 @@ static int __init mpc831x_rdb_probe(void) | |||
74 | static struct of_device_id __initdata of_bus_ids[] = { | 74 | static struct of_device_id __initdata of_bus_ids[] = { |
75 | { .compatible = "simple-bus" }, | 75 | { .compatible = "simple-bus" }, |
76 | { .compatible = "gianfar" }, | 76 | { .compatible = "gianfar" }, |
77 | { .compatible = "gpio-leds", }, | ||
77 | {}, | 78 | {}, |
78 | }; | 79 | }; |
79 | 80 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c index a1908d261240..e00801c42540 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c | |||
@@ -72,6 +72,7 @@ static struct of_device_id mpc837x_ids[] = { | |||
72 | { .compatible = "soc", }, | 72 | { .compatible = "soc", }, |
73 | { .compatible = "simple-bus", }, | 73 | { .compatible = "simple-bus", }, |
74 | { .compatible = "gianfar", }, | 74 | { .compatible = "gianfar", }, |
75 | { .compatible = "gpio-leds", }, | ||
75 | {}, | 76 | {}, |
76 | }; | 77 | }; |
77 | 78 | ||