Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[karo-tx-linux.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index a394957ddaf4922c737b0e49394fba38e9d47fcf..a949c4fbbddd4cb428c5cd21fd9a9557db9a5eb4 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -330,6 +330,11 @@ config MEM_MT48LC32M16A2TG_75
        depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP || BFIN526_EZBRD)
        default y
 
+config MEM_MT48LC32M8A2_75
+       bool
+       depends on (BFIN518F_EZBRD)
+       default y
+
 source "arch/blackfin/mach-bf518/Kconfig"
 source "arch/blackfin/mach-bf527/Kconfig"
 source "arch/blackfin/mach-bf533/Kconfig"
@@ -524,14 +529,6 @@ config MEM_SDGCTL
        default 0x0
 endmenu
 
-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
 #
@@ -1015,12 +1012,6 @@ config EBIU_FCTLVAL
        hex "Flash Memory Bank Control Register"
        depends on BF54x
        default 6
-
-config HARDWARE_PM
-       bool "OProfile use hardware porformance monitor"
-       depends on OPROFILE
-       default n
-
 endmenu
 
 #############################################################################