summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--drivers/netconsole.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4263dcd374..eefc04f240 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Remove unnecessary dependency of netconsole on CONFIG_NET_MULTI
+ Patch by Marcus Hall, 24 Aug 2005
+
* Fix the machine-id of the Cogent csb637 board
Patch by Anders Larsen, 05 Oct 2005
diff --git a/drivers/netconsole.c b/drivers/netconsole.c
index 9cf6cd6339..9a0a24f3ac 100644
--- a/drivers/netconsole.c
+++ b/drivers/netconsole.c
@@ -29,10 +29,6 @@
#include <devices.h>
#include <net.h>
-#ifndef CONFIG_NET_MULTI
-#error define CONFIG_NET_MULTI to use netconsole
-#endif
-
static char input_buffer[512];
static int input_size = 0; /* char count in input buffer */
static int input_offset = 0; /* offset to valid chars in input buffer */