aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netconsole.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-06 22:40:03 -0400
committerSteve French <sfrench@us.ibm.com>2006-06-06 22:40:03 -0400
commitf3ffb6814408f29817fc84d40ecc9c796acaa3ab (patch)
treeb4702cbdbf2c4517a5986bbaa971495b0f92a877 /drivers/net/netconsole.c
parent5bafd76593f060540acbea3b61e3087e009aa269 (diff)
parent1def630a6a49dda5bc89dfbd86656293640456f0 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/netconsole.c')
-rw-r--r--drivers/net/netconsole.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 66e74f740261..bf58db29e2ed 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -107,7 +107,7 @@ static int init_netconsole(void)
107 107
108 if(!configured) { 108 if(!configured) {
109 printk("netconsole: not configured, aborting\n"); 109 printk("netconsole: not configured, aborting\n");
110 return -EINVAL; 110 return 0;
111 } 111 }
112 112
113 if(netpoll_setup(&np)) 113 if(netpoll_setup(&np))