From c7f2f4bba73e53d9b5d1926b220205884bd26d4a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 25 Feb 2010 21:46:48 +0100 Subject: fix merge problem, enable e1000 driver correctly --- toolchain/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'toolchain/Makefile') diff --git a/toolchain/Makefile b/toolchain/Makefile index fe16fc6af..d2f59f8ba 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -38,15 +38,11 @@ clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) gcc-prepare: binutils-install gmp-install mpfr-install -<<<<<<< HEAD ifeq ($(ADK_TARGET_LIB_GLIBC),y) $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare else $(LIBC)-prepare: gcc-prepare kernel-headers-prepare endif -======= -$(LIBC)-prepare: gcc-prepare kernel-headers-prepare ->>>>>>> 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 gcc-configure: $(LIBC)-prepare $(LIBC)-compile: gcc-configure gcc-compile: $(LIBC)-install -- cgit v1.2.3