diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-24 15:29:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-24 15:29:14 +1100 |
| commit | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (patch) | |
| tree | 1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f /arch/powerpc/platforms/8xx/ep88xc.c | |
| parent | 9156ad48338e0306e508ead5c0d9986050744475 (diff) | |
| parent | 96f39c1718091d63dc1c5012d566737ea0d2a20c (diff) | |
| download | blackbird-op-linux-dcb571be2019ae677bc5ed64437dbc87ae1eb67f.tar.gz blackbird-op-linux-dcb571be2019ae677bc5ed64437dbc87ae1eb67f.zip | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'arch/powerpc/platforms/8xx/ep88xc.c')
| -rw-r--r-- | arch/powerpc/platforms/8xx/ep88xc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c index c518b6cc5fab..88afa353f1d2 100644 --- a/arch/powerpc/platforms/8xx/ep88xc.c +++ b/arch/powerpc/platforms/8xx/ep88xc.c @@ -155,12 +155,11 @@ static struct of_device_id __initdata of_bus_ids[] = { static int __init declare_of_platform_devices(void) { /* Publish the QE devices */ - if (machine_is(ep88xc)) - of_platform_bus_probe(NULL, of_bus_ids, NULL); + of_platform_bus_probe(NULL, of_bus_ids, NULL); return 0; } -device_initcall(declare_of_platform_devices); +machine_device_initcall(ep88xc, declare_of_platform_devices); define_machine(ep88xc) { .name = "Embedded Planet EP88xC", |
