aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/vio.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-10-11 00:57:26 -0400
committerPaul Mackerras <paulus@samba.org>2007-10-11 06:40:47 -0400
commitb833b481c10cf591b15cc674948cc514e55d3b94 (patch)
tree6e02bb29bff6eea2716c0b02c0a2779d2b80480c /arch/powerpc/kernel/vio.c
parentdd9b67ab37d57da67840276d28957498512d4dd8 (diff)
[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.c3
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)
247 int err; 247 int err;
248 struct device_node *node_vroot; 248 struct device_node *node_vroot;
249 249
250 if (firmware_has_feature(FW_FEATURE_ISERIES))
251 iommu_vio_init();
252
253 err = bus_register(&vio_bus_type); 250 err = bus_register(&vio_bus_type);
254 if (err) { 251 if (err) {
255 printk(KERN_ERR "failed to register VIO bus\n"); 252 printk(KERN_ERR "failed to register VIO bus\n");