projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'denx-coldfire' into coldfire-aug2007
[oweals/u-boot.git]
/
drivers
/
netconsole.c
diff --git
a/drivers/netconsole.c
b/drivers/netconsole.c
index 9cf6cd6339951cbe7b1f91b73a061bb5c4c57653..69089f92cec913b1ab6d0c33f94273d8cc10badf 100644
(file)
--- a/
drivers/netconsole.c
+++ b/
drivers/netconsole.c
@@
-29,9
+29,7
@@
#include <devices.h>
#include <net.h>
#include <devices.h>
#include <net.h>
-#ifndef CONFIG_NET_MULTI
-#error define CONFIG_NET_MULTI to use netconsole
-#endif
+DECLARE_GLOBAL_DATA_PTR;
static char input_buffer[512];
static int input_size = 0; /* char count in input buffer */
static char input_buffer[512];
static int input_size = 0; /* char count in input buffer */
@@
-109,8
+107,6
@@
int nc_input_packet (uchar * pkt, unsigned dest, unsigned src, unsigned len)
static void nc_send_packet (const char *buf, int len)
{
static void nc_send_packet (const char *buf, int len)
{
- DECLARE_GLOBAL_DATA_PTR;
-
struct eth_device *eth;
int inited = 0;
uchar *pkt;
struct eth_device *eth;
int inited = 0;
uchar *pkt;