diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-05-18 03:21:26 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:24 -0400 |
commit | 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 (patch) | |
tree | a56220353855a2339367a0b3acf011d9dede33fd /arch/powerpc/kernel/vio.c | |
parent | 4c76e0bcdeac27b45d55955f073a97ff8452a42f (diff) |
[PATCH] powerpc: the iSeries vio lan driver changed device type
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>
Diffstat (limited to 'arch/powerpc/kernel/vio.c')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index 2cda65b8171b..fe92727aca30 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -71,7 +71,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev) | |||
71 | { | 71 | { |
72 | #ifdef CONFIG_PPC_ISERIES | 72 | #ifdef CONFIG_PPC_ISERIES |
73 | if (firmware_has_feature(FW_FEATURE_ISERIES)) { | 73 | if (firmware_has_feature(FW_FEATURE_ISERIES)) { |
74 | if (strcmp(dev->type, "vlan") == 0) | 74 | if (strcmp(dev->type, "network") == 0) |
75 | return &veth_iommu_table; | 75 | return &veth_iommu_table; |
76 | return &vio_iommu_table; | 76 | return &vio_iommu_table; |
77 | } else | 77 | } else |