diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-10-11 14:57:26 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-11 20:40:47 +1000 |
| commit | b833b481c10cf591b15cc674948cc514e55d3b94 (patch) | |
| tree | 6e02bb29bff6eea2716c0b02c0a2779d2b80480c /arch/powerpc/kernel/vio.c | |
| parent | dd9b67ab37d57da67840276d28957498512d4dd8 (diff) | |
| download | linux-b833b481c10cf591b15cc674948cc514e55d3b94.tar.bz2 | |
[POWERPC] iSeries: Move detection of virtual cdroms
Now we will only have entries in the device tree for the actual existing
devices (including their OS/400 properties). This way viocd.c gets all
the information about the devices from the device tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
| -rw-r--r-- | arch/powerpc/kernel/vio.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index b7c9e44ef180..cb22a3557c4e 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c @@ -247,9 +247,6 @@ static int __init vio_bus_init(void) int err; struct device_node *node_vroot; - if (firmware_has_feature(FW_FEATURE_ISERIES)) - iommu_vio_init(); - err = bus_register(&vio_bus_type); if (err) { printk(KERN_ERR "failed to register VIO bus\n"); |