diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/kernel.config | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/linux/kernel.config')
| -rw-r--r-- | target/linux/kernel.config | 1 |
1 files changed, 0 insertions, 1 deletions
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 |