Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / drivers / net / iseries_veth.c

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 33613fe9556cc65fb91237faea0ee38dcef69a1e..d86d8f055a6cd7d12330237baec71550230e4609 100644 (file)
--- 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>
 
@@ -1653,6 +1653,7 @@ static struct vio_driver veth_driver = {
        .remove = veth_remove,
        .driver = {
                .name = DRV_NAME,
+               .owner = THIS_MODULE,
        }
 };