Merge branch 'master' into upstream-fixes

[linux-2.6-omap-h63xx.git] / drivers / usb / net / gl620a.c

diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c
index faf1e86be687db900e4aeb15965ca52b012971d3..a3242be21959561504431d9004415d25ff37b2cc 100644 (file)
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/usb/net/gl620a.c
@@ -21,7 +21,6 @@
 // #define     DEBUG                   // error path messages, extra info
 // #define     VERBOSE                 // more; success messages
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
@@ -107,7 +106,7 @@ static inline int gl_control_write(struct usbnet *dev, u8 request, u16 value)
        return retval;
 }
 
-static void gl_interrupt_complete(struct urb *urb, struct pt_regs *regs)
+static void gl_interrupt_complete(struct urb *urb)
 {
        int status = urb->status;