From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/linux/kernel.config | 1 - 1 file changed, 1 deletion(-) (limited to 'target/linux/kernel.config') diff --git a/target/linux/kernel.config b/target/linux/kernel.config index f88265e9d..f20b2faef 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -18,7 +18,6 @@ CONFIG_ETHERNET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_BLOCK=y -CONFIG_BLK_DEV=y CONFIG_LBDAF=y CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y -- cgit v1.2.3