Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eb2c23f authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: fix merge errors during 2.6.26 upgrade 



Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 5b04f271

arch/blackfin/Kconfig

+8 −10
Original line number Diff line number Diff line
@@ -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