]> err.no Git - linux-2.6/commitdiff
[PATCH] powerpc: the iSeries vio lan driver changed device type
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 May 2006 07:21:26 +0000 (17:21 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 19 May 2006 05:02:24 +0000 (15:02 +1000)
So the IOMMU table building code needs to match.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/vio.c

index 2cda65b8171b77f44c67a3a7bbeedac49b8849e7..fe92727aca3040f828452e97fc0ff1d92bf4644f 100644 (file)
@@ -71,7 +71,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
 #ifdef CONFIG_PPC_ISERIES
        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-               if (strcmp(dev->type, "vlan") == 0)
+               if (strcmp(dev->type, "network") == 0)
                        return &veth_iommu_table;
                return &vio_iommu_table;
        } else