diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 16:27:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 16:27:50 -0800 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /drivers/net | |
| parent | 0bbacc402e67abca8794a8401c1621dc0c0202e9 (diff) | |
| parent | c51e3a417bb0f295e13a5bad86302b5212eafdf3 (diff) | |
| download | op-kernel-dev-602d4a7e2f4b843d1a67375d4d7104073495b758.zip op-kernel-dev-602d4a7e2f4b843d1a67375d4d7104073495b758.tar.gz | |
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 f5ea39f..d86d8f0 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -72,12 +72,12 @@ #include <linux/ethtool.h> #include <asm/abs_addr.h> -#include <asm/iSeries/mf.h> +#include <asm/iseries/mf.h> #include <asm/uaccess.h> -#include <asm/iSeries/HvLpConfig.h> -#include <asm/iSeries/HvTypes.h> -#include <asm/iSeries/HvLpEvent.h> +#include <asm/iseries/hv_lp_config.h> +#include <asm/iseries/hv_types.h> +#include <asm/iseries/hv_lp_event.h> #include <asm/iommu.h> #include <asm/vio.h> |
