From: Mike Frysinger Date: Wed, 8 Oct 2008 09:39:02 +0000 (+0800) Subject: Blackfin arch: fix merge errors during 2.6.26 upgrade X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7eb2c23f602ab35c5f4227bc87945a3c78a14150;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Blackfin arch: fix merge errors during 2.6.26 upgrade Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 9d936a3986c8..a837bb6e7bbd 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -375,14 +375,6 @@ config SCLK_DIV This can be between 1 and 15 System Clock = (PLL frequency) / (this setting) -config MAX_MEM_SIZE - int "Max SDRAM Memory Size in MBytes" - depends on !MPU - default 512 - help - This is the max memory size that the kernel will create CPLB - tables for. Your system will not be able to handle any more. - choice prompt "DDR SDRAM Chip Type" depends on BFIN_KERNEL_CLOCK @@ -396,6 +388,14 @@ config MEM_MT46V32M16_5B bool "MT46V32M16_5B" endchoice +config MAX_MEM_SIZE + int "Max SDRAM Memory Size in MBytes" + depends on !MPU + default 512 + help + This is the max memory size that the kernel will create CPLB + tables for. Your system will not be able to handle any more. + # # Max & Min Speeds for various Chips # @@ -462,8 +462,6 @@ config CYCLES_CLOCKSOURCE source kernel/time/Kconfig -comment "Memory Setup" - comment "Misc" choice