diff --git a/[refs] b/[refs]
index 4c4bb44a3dbb..c55ae33ea629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe6fe792faec3fc2d2db39b69651682b8c4e7fcb
+refs/heads/master: 0c1ad04aecb975f2a2014e1bc5a2fa23923ecbd9
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 2d7d6d473781..42ea4b0e59f1 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -792,6 +792,12 @@ int netpoll_setup(struct netpoll *np)
 		return -ENODEV;
 	}
 
+	if (ndev->master) {
+		printk(KERN_ERR "%s: %s is a slave device, aborting.\n",
+		       np->name, np->dev_name);
+		return -EBUSY;
+	}
+
 	if (!netif_running(ndev)) {
 		unsigned long atmost, atleast;