diff options
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*); |