diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2009-04-23 04:57:12 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2009-04-23 04:57:12 +0000 |
| commit | 89832d3b32eeb541940161d1b1cfd54742437a5f (patch) | |
| tree | beb91b4a4fa4c0d1f044c364120635d15d5890e7 /bsd_eth_drivers | |
| parent | - ported to RTEMS. (diff) | |
| download | libbsdport-89832d3b32eeb541940161d1b1cfd54742437a5f.tar.bz2 | |
- resolved conflict
Diffstat (limited to 'bsd_eth_drivers')
| -rw-r--r-- | bsd_eth_drivers/libbsdport/devicet.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bsd_eth_drivers/libbsdport/devicet.c b/bsd_eth_drivers/libbsdport/devicet.c index 45108a2..fde3975 100644 --- a/bsd_eth_drivers/libbsdport/devicet.c +++ b/bsd_eth_drivers/libbsdport/devicet.c @@ -12,12 +12,8 @@ #include <sys/bus.h> #include "libbsdport_api.h" -<<<<<<< devicet.c #define DEBUG 0 int libbsdportAttachVerbose = DEBUG; -======= -#undef DEBUG ->>>>>>> 1.1.1.2 extern void real_libc_free(void*); |