Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index bf58db29e2ed..69233f6aa05c 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -60,7 +60,6 @@ static struct netpoll np = {
         .local_port = 6665,
         .remote_port = 6666,
         .remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-        .drop = netpoll_queue,
 };
 static int configured = 0;
 
@@ -102,6 +101,8 @@ __setup("netconsole=", option_setup);
 
 static int init_netconsole(void)
 {
+        int err;
+
         if(strlen(config))
                 option_setup(config);
 
@@ -110,8 +111,9 @@ static int init_netconsole(void)
                 return 0;
         }
 
-        if(netpoll_setup(&np))
-                return -EINVAL;
+        err = netpoll_setup(&np);
+        if (err)
+                return err;
 
         register_console(&netconsole);
         printk(KERN_INFO "netconsole: network logging started\n");