sky2: Shut off interrupts before NAPI

[safe/jmp/linux-2.6] / drivers / net / pppox.c

diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index c14ee24..d4191ef 100644 (file)
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -22,7 +22,6 @@
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/net.h>
@@ -104,7 +103,8 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 
 EXPORT_SYMBOL(pppox_ioctl);
 
-static int pppox_create(struct net *net, struct socket *sock, int protocol)
+static int pppox_create(struct net *net, struct socket *sock, int protocol,
+                       int kern)
 {
        int rc = -EPROTOTYPE;