diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
commit | b708ee58f7bef7b479f5b6999a8e976d332691b6 (patch) | |
tree | 4b13e9706173c676a0278ca1f565bc54b41943a2 /target/linux/config/Config.in.flash | |
parent | f3cc98651b738ac7f2dc56ea772afa9f874b9d3b (diff) | |
parent | 7c1f6387d20faf69453a59de6c34227f9f2b833c (diff) |
resolve merge
Diffstat (limited to 'target/linux/config/Config.in.flash')
-rw-r--r-- | target/linux/config/Config.in.flash | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index dda8ad4c9..d35f1c866 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -87,7 +87,6 @@ config ADK_KERNEL_MTD_OF_PARTS default n config ADK_KERNEL_MTD_M25P80 - select ADK_KERNEL_BLOCK select ADK_KERNEL_MTD select ADK_KERNEL_MTD_PARTITIONS select ADK_KERNEL_MTD_CHAR @@ -113,7 +112,6 @@ config ADK_KERNEL_MTD_AR2315 config ADK_TARGET_NAND boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_YAFFS_FS select ADK_KERNEL_YAFFS_YAFFS2 @@ -130,7 +128,6 @@ config ADK_TARGET_NAND config ADK_TARGET_MTD boolean - select ADK_KERNEL_BLOCK select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_JFFS2_FS select ADK_KERNEL_MTD |