diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:37:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:37:24 -0500 |
| commit | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (patch) | |
| tree | cb30b4e80f37e0d734a826aa6b29394f46123f9f /drivers/net/iseries_veth.c | |
| parent | 96a71d52bb91d9b386a60f904956420f98946dd3 (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | lwn-d40d9d29c020f8466c96f8e3ad4b7c014ff1085d.tar.gz lwn-d40d9d29c020f8466c96f8e3ad4b7c014ff1085d.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/iseries_veth.c')
| -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 @@ #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> |