diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/blackfin/Kconfig | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
| download | linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.tar.bz2 | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/blackfin/Kconfig')
| -rw-r--r-- | arch/blackfin/Kconfig | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 1a4930509325..b1b111bb2f3a 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -25,6 +25,10 @@ config BLACKFIN bool default y +config ZONE_DMA + bool + default y + config BFIN bool default y @@ -189,7 +193,7 @@ config BFIN537_BLUETECHNIX_CM CM-BF537 support for EVAL- and DEV-Board. config BFIN561_BLUETECHNIX_CM - bool "BF561-CM" + bool "Bluetechnix CM-BF561" depends on (BF561) help CM-BF561 support for EVAL- and DEV-Board. @@ -200,6 +204,12 @@ config BFIN561_EZKIT help BF561-EZKIT-LITE board Support. +config BFIN561_TEPLA + bool "BF561-TEPLA" + depends on (BF561) + help + BF561-TEPLA board Support. + config PNAV10 bool "PNAV 1.0 board" depends on (BF537) @@ -560,14 +570,6 @@ endchoice source "mm/Kconfig" -config LARGE_ALLOCS - bool "Allow allocating large blocks (> 1MB) of memory" - help - Allow the slab memory allocator to keep chains for very large - memory sizes - upto 32MB. You may need this if your system has - a lot of RAM, and you need to able to allocate very large - contiguous chunks. If unsure, say N. - config BFIN_DMA_5XX bool "Enable DMA Support" depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561) |