From 1fe6bccdef775209317d258e024bec12066ac54d Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 May 2006 17:21:26 +1000
Subject: [PATCH] --- yaml --- r: 28711 b: refs/heads/master c:
 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 h: refs/heads/master i:   28709:
 0b1a13b5153c0c9379722c0288bb67a9db057cb7   28707:
 183ae73b5bb66a1f590fee65314522a0fd4a79af   28703:
 d1b3c34093c2d6abc695f42690ba0d019b6f47f2 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/vio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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