fix merge problem, enable e1000 driver correctly

target/Config.in

@@ -543,6 +543,7 @@ config ADK_LINUX_CRIS_QEMU
 config ADK_LINUX_X86_QEMU
 	bool "x86"
 	select ADK_x86_qemu
+	select ADK_KERNEL_NETDEV_1000
 	select ADK_KPACKAGE_KMOD_E1000
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_SCSI
@@ -557,6 +558,7 @@ config ADK_LINUX_X86_QEMU
 config ADK_LINUX_X86_64_QEMU
 	bool "x86_64"
 	select ADK_x86_64_qemu
+	select ADK_KERNEL_NETDEV_1000
 	select ADK_KPACKAGE_KMOD_E1000
 	select ADK_KERNEL_INPUT_KEYBOARD
 	select ADK_KERNEL_SCSI

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