diff options
-rw-r--r-- | arch/arm/configs/marzen_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 5cc6360340b1..103b8755d1a6 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig | |||
@@ -30,8 +30,6 @@ CONFIG_HIGHMEM=y | |||
30 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 30 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
31 | CONFIG_ZBOOT_ROM_BSS=0x0 | 31 | CONFIG_ZBOOT_ROM_BSS=0x0 |
32 | CONFIG_ARM_APPENDED_DTB=y | 32 | CONFIG_ARM_APPENDED_DTB=y |
33 | CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on" | ||
34 | CONFIG_CMDLINE_FORCE=y | ||
35 | CONFIG_KEXEC=y | 33 | CONFIG_KEXEC=y |
36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
37 | CONFIG_PM_RUNTIME=y | 35 | CONFIG_PM_RUNTIME=y |