aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/Kconfig
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-10-08 05:39:02 -0400
committerBryan Wu <cooloney@kernel.org>2008-10-08 05:39:02 -0400
commit7eb2c23f602ab35c5f4227bc87945a3c78a14150 (patch)
tree6b425917db9e1e01d4f815a2aedf7c55e19b9915 /arch/blackfin/Kconfig
parent5b04f271fe49bb7adb061de454d383c027a18de0 (diff)
Blackfin arch: fix merge errors during 2.6.26 upgrade
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/Kconfig')
-rw-r--r--arch/blackfin/Kconfig18
1 files changed, 8 insertions, 10 deletions
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
375 This can be between 1 and 15 375 This can be between 1 and 15
376 System Clock = (PLL frequency) / (this setting) 376 System Clock = (PLL frequency) / (this setting)
377 377
378config MAX_MEM_SIZE
379 int "Max SDRAM Memory Size in MBytes"
380 depends on !MPU
381 default 512
382 help
383 This is the max memory size that the kernel will create CPLB
384 tables for. Your system will not be able to handle any more.
385
386choice 378choice
387 prompt "DDR SDRAM Chip Type" 379 prompt "DDR SDRAM Chip Type"
388 depends on BFIN_KERNEL_CLOCK 380 depends on BFIN_KERNEL_CLOCK
@@ -396,6 +388,14 @@ config MEM_MT46V32M16_5B
396 bool "MT46V32M16_5B" 388 bool "MT46V32M16_5B"
397endchoice 389endchoice
398 390
391config MAX_MEM_SIZE
392 int "Max SDRAM Memory Size in MBytes"
393 depends on !MPU
394 default 512
395 help
396 This is the max memory size that the kernel will create CPLB
397 tables for. Your system will not be able to handle any more.
398
399# 399#
400# Max & Min Speeds for various Chips 400# Max & Min Speeds for various Chips
401# 401#
@@ -462,8 +462,6 @@ config CYCLES_CLOCKSOURCE
462 462
463source kernel/time/Kconfig 463source kernel/time/Kconfig
464 464
465comment "Memory Setup"
466
467comment "Misc" 465comment "Misc"
468 466
469choice 467choice