diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 19:27:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 19:27:50 -0500 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /drivers/net | |
| parent | 0bbacc402e67abca8794a8401c1621dc0c0202e9 (diff) | |
| parent | c51e3a417bb0f295e13a5bad86302b5212eafdf3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/iseries_veth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index f5ea39ff1017..d86d8f055a6c 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -72,12 +72,12 @@ | |||
| 72 | #include <linux/ethtool.h> | 72 | #include <linux/ethtool.h> |
| 73 | 73 | ||
| 74 | #include <asm/abs_addr.h> | 74 | #include <asm/abs_addr.h> |
| 75 | #include <asm/iSeries/mf.h> | 75 | #include <asm/iseries/mf.h> |
| 76 | #include <asm/uaccess.h> | 76 | #include <asm/uaccess.h> |
| 77 | 77 | ||
| 78 | #include <asm/iSeries/HvLpConfig.h> | 78 | #include <asm/iseries/hv_lp_config.h> |
| 79 | #include <asm/iSeries/HvTypes.h> | 79 | #include <asm/iseries/hv_types.h> |
| 80 | #include <asm/iSeries/HvLpEvent.h> | 80 | #include <asm/iseries/hv_lp_event.h> |
| 81 | #include <asm/iommu.h> | 81 | #include <asm/iommu.h> |
| 82 | #include <asm/vio.h> | 82 | #include <asm/vio.h> |
| 83 | 83 | ||