remove options dropped upstream

[packages/kernel.git] / kernel-arm.config

diff --git a/kernel-arm.config b/kernel-arm.config
index 97e08bc5ac5734bd6940f41871b5ef0d03f632ec..7e519363e3fe5fdd14cc321850fc0d1891c2e93e 100644 (file)
--- a/kernel-arm.config
+++ b/kernel-arm.config
@@ -49,7 +49,6 @@ ARCH_AIROHA arm=n
 #- file arch/arm/mach-omap1/Kconfig goes here
 #- file arch/arm/mach-omap2/Kconfig goes here
 #- file arch/arm/mach-orion5x/Kconfig goes here
-#- file arch/arm/mach-oxnas/Kconfig goes here
 #- file arch/arm/mach-pxa/Kconfig goes here
 #- file arch/arm/mach-qcom/Kconfig goes here
 #- file arch/arm/mach-rda/Kconfig goes here
@@ -118,7 +117,7 @@ HIGHMEM arm=y
 HIGHPTE arm=y
 CPU_SW_DOMAIN_PAN arm=y
 ARM_MODULE_PLTS arm=y
-ARCH_FORCE_MAX_ORDER arm=11
+ARCH_FORCE_MAX_ORDER arm=10
 UACCESS_WITH_MEMCPY arm=y
 PARAVIRT arm=y
 PARAVIRT_TIME_ACCOUNTING arm=y
@@ -131,9 +130,7 @@ ZBOOT_ROM_TEXT arm=0x0
 ZBOOT_ROM_BSS arm=0x0
 ARM_APPENDED_DTB arm=n
 CMDLINE arm=""
-KEXEC arm=y
 ATAGS_PROC arm=y
-CRASH_DUMP arm=n
 AUTO_ZRELADDR arm=y
 EFI arm=n
 #- file drivers/cpufreq/Kconfig goes here
@@ -318,11 +315,6 @@ SOC_DRA7XX arm=n
 #- OMAP Core Type
 #- OMAP Legacy Platform Data Board Type
 
-#-
-#- *** FILE: arch/arm/mach-oxnas/Kconfig ***
-#-
-ARCH_OXNAS arm=n
-
 #-
 #- *** FILE: arch/arm/mach-pxa/Kconfig ***
 #-
@@ -470,6 +462,7 @@ DEBUG_ALIGN_RODATA arm=y
 CPU_FREQ_GOV_PERFORMANCE arm=y
 #- CPU frequency scaling drivers
 CPUFREQ_DT arm=m
+CPUFREQ_DT_PLATDEV arm=m
 #- file drivers/cpufreq/Kconfig.x86 goes here
 #- file drivers/cpufreq/Kconfig.arm goes here
 #- file drivers/cpufreq/Kconfig.powerpc goes here