Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h

2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index ecf9798987fa..2a2fc17b2878 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -613,7 +613,9 @@ static int __devinit mal_probe(struct of_device *ofdev,
         INIT_LIST_HEAD(&mal->list);
         spin_lock_init(&mal->lock);
 
-        netif_napi_add(NULL, &mal->napi, mal_poll,
+        init_dummy_netdev(&mal->dummy_dev);
+
+        netif_napi_add(&mal->dummy_dev, &mal->napi, mal_poll,
                        CONFIG_IBM_NEW_EMAC_POLL_WEIGHT);
 
         /* Load power-on reset defaults */
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h
index 2f0a87360844..9ededfbf0726 100644
--- a/drivers/net/ibm_newemac/mal.h
+++ b/drivers/net/ibm_newemac/mal.h
@@ -214,6 +214,8 @@ struct mal_instance {
         int                     index;
         spinlock_t              lock;
 
+        struct net_device       dummy_dev;
+
         unsigned int features;
 };