From 87a67b896f6d8400df71701215b6c29c9bb99dc6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 23 May 2011 12:16:51 +0200 Subject: [PATCH] projects/ION/linux: fix merge conflict Signed-off-by: Stephan Raue --- projects/ION/linux/linux.x86_64.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 1c478b8dff..9e30284d65 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -913,7 +913,6 @@ CONFIG_NET_PCI=y # CONFIG_KSZ884X_PCI is not set # CONFIG_B44 is not set CONFIG_FORCEDETH=y -CONFIG_FORCEDETH=m CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set