diff --git a/[refs] b/[refs] index 5d3048b243b0..9527c2f49df0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c76e0bcdeac27b45d55955f073a97ff8452a42f +refs/heads/master: 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c index 2cda65b8171b..fe92727aca30 100644 --- a/trunk/arch/powerpc/kernel/vio.c +++ b/trunk/arch/powerpc/kernel/vio.c @@ -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