projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.14-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
configs
/
markeins_defconfig
diff --git
a/arch/mips/configs/markeins_defconfig
b/arch/mips/configs/markeins_defconfig
index 636f82b89fd30e97ed54baa75c3bca623c46745f..4c2c0c4b9bb1dc269fcd2283981ddd631cf97ab0 100644
(file)
--- a/
arch/mips/configs/markeins_defconfig
+++ b/
arch/mips/configs/markeins_defconfig
@@
-124,7
+124,6
@@
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_FW_LOADER=m
CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y