git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dccp: Lockless integration of CCID congestion-control plugins
[safe/jmp/linux-2.6]
/
arch
/
m32r
/
Kconfig
diff --git
a/arch/m32r/Kconfig
b/arch/m32r/Kconfig
index
ab9a264
..
29047d5
100644
(file)
--- a/
arch/m32r/Kconfig
+++ b/
arch/m32r/Kconfig
@@
-8,6
+8,8
@@
mainmenu "Linux/M32R Kernel Configuration"
config M32R
bool
default y
config M32R
bool
default y
+ select HAVE_IDE
+ select HAVE_OPROFILE
config SBUS
bool
config SBUS
bool
@@
-34,8
+36,14
@@
config NO_IOPORT
config NO_DMA
def_bool y
config NO_DMA
def_bool y
+config HZ
+ int
+ default 100
+
source "init/Kconfig"
source "init/Kconfig"
+source "kernel/Kconfig.freezer"
+
menu "Processor type and features"
menu "Processor type and features"
@@
-207,10
+215,6
@@
config MEMORY_SIZE
default "01000000" if PLAT_M32104UT
default "00800000" if PLAT_OAKS32R
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
config ARCH_DISCONTIGMEM_ENABLE
bool "Internal RAM Support"
depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104
@@
-235,6
+239,11
@@
config IRAM_SIZE
# Define implied options from the CPU selection here
#
# Define implied options from the CPU selection here
#
+config GENERIC_LOCKBREAK
+ bool
+ default y
+ depends on SMP && PREEMPT
+
config RWSEM_GENERIC_SPINLOCK
bool
depends on M32R
config RWSEM_GENERIC_SPINLOCK
bool
depends on M32R
@@
-264,7
+273,7
@@
config GENERIC_CALIBRATE_DELAY
bool
default y
bool
default y
-config SCHED_
NO_NO_
OMIT_FRAME_POINTER
+config SCHED_OMIT_FRAME_POINTER
bool
default y
bool
default y
@@
-282,6
+291,7
@@
config PREEMPT
config SMP
bool "Symmetric multi-processing support"
config SMP
bool "Symmetric multi-processing support"
+ select USE_GENERIC_SMP_HELPERS
---help---
This enables support for systems with more than one CPU. If you have
a system with only one CPU, like most personal computers, say N. If
---help---
This enables support for systems with more than one CPU. If you have
a system with only one CPU, like most personal computers, say N. If
@@
-297,8
+307,7
@@
config SMP
Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
Management" code will be disabled if you say Y here.
Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
Management" code will be disabled if you say Y here.
- See also the <file:Documentation/smp.txt>,
- and the SMP-HOWTO available at
+ See also the SMP-HOWTO available at
<http://www.linuxdoc.org/docs.html#howto>.
If you don't know what to do here, say N.
<http://www.linuxdoc.org/docs.html#howto>.
If you don't know what to do here, say N.
@@
-354,11
+363,6
@@
config PCI
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
VESA. If you have PCI, say Y, otherwise N.
- The PCI-HOWTO, available from
- <http://www.linuxdoc.org/docs.html#howto>, contains valuable
- information about which PCI hardware does work under Linux and which
- doesn't.
-
choice
prompt "PCI access mode"
depends on PCI
choice
prompt "PCI access mode"
depends on PCI
@@
-401,11
+405,7
@@
config PCI_DIRECT
source "drivers/pci/Kconfig"
config ISA
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"
source "drivers/pcmcia/Kconfig"
@@
-426,8
+426,6
@@
source "drivers/Kconfig"
source "fs/Kconfig"
source "fs/Kconfig"
-source "kernel/Kconfig.instrumentation"
-
source "arch/m32r/Kconfig.debug"
source "security/Kconfig"
source "arch/m32r/Kconfig.debug"
source "security/Kconfig"