Title: [5274] trunk/arch/blackfin/Kconfig: fix merge errors during 2.6.26 upgrade
- Revision
- 5274
- Author
- vapier
- Date
- 2008-09-10 01:19:09 -0500 (Wed, 10 Sep 2008)
Log Message
fix merge errors during 2.6.26 upgrade
Modified Paths
Diff
Modified: trunk/arch/blackfin/Kconfig (5273 => 5274)
--- trunk/arch/blackfin/Kconfig 2008-09-10 03:24:40 UTC (rev 5273)
+++ trunk/arch/blackfin/Kconfig 2008-09-10 06:19:09 UTC (rev 5274)
@@ -368,14 +368,6 @@
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
@@ -389,6 +381,14 @@
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
#
@@ -455,8 +455,6 @@
source kernel/time/Kconfig
-comment "Memory Setup"
-
comment "Misc"
choice
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
