diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:30:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 08:30:47 -0700 |
| commit | df45eddc60e1ab4c81b61e240271eabb4fb176e8 (patch) | |
| tree | 7cbaf1a7a191f7b6274afbc071bbc1453f73d668 /arch/m32r/Kconfig | |
| parent | 929675d58c5b4883050804f2b48de2293803862d (diff) | |
| parent | 81e4807303c416a0defdce8b23a6204416d33280 (diff) | |
Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r/kernel/: cleanups
m32r: export __ndelay
m32r: export empty_zero_page
m32r: don't offer CONFIG_ISA
m32r: remove the unused NOHIGHMEM option
Diffstat (limited to 'arch/m32r/Kconfig')
| -rw-r--r-- | arch/m32r/Kconfig | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index a5f864c445b..f57113f1f89 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -216,10 +216,6 @@ config MEMORY_SIZE default "01000000" if PLAT_M32104UT default "00800000" if PLAT_OAKS32R -config NOHIGHMEM - bool - default y - config ARCH_DISCONTIGMEM_ENABLE bool "Internal RAM Support" depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104 @@ -410,11 +406,7 @@ config PCI_DIRECT source "drivers/pci/Kconfig" config ISA - bool "ISA support" - help - Find out whether you have ISA slots on your motherboard. ISA is the - name of a bus system, i.e. the way the CPU talks to the other stuff - inside your box. If you have ISA, say Y, otherwise N. + bool source "drivers/pcmcia/Kconfig" |