git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
sparc
/
Kconfig
diff --git
a/arch/sparc/Kconfig
b/arch/sparc/Kconfig
index
60aa2b7
..
bf9aac0
100644
(file)
--- a/
arch/sparc/Kconfig
+++ b/
arch/sparc/Kconfig
@@
-23,7
+23,6
@@
menu "General machine setup"
config SMP
bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
config SMP
bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
- depends on BROKEN
---help---
This enables support for systems with more than one CPU. If you have
a system with only one CPU, say N. If you have a system with more
---help---
This enables support for systems with more than one CPU. If you have
a system with only one CPU, say N. If you have a system with more
@@
-151,6
+150,14
@@
config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM
bool
config RWSEM_XCHGADD_ALGORITHM
bool
+config GENERIC_FIND_NEXT_BIT
+ bool
+ default y
+
+config GENERIC_HWEIGHT
+ bool
+ default y
+
config GENERIC_CALIBRATE_DELAY
bool
default y
config GENERIC_CALIBRATE_DELAY
bool
default y
@@
-159,6
+166,14
@@
config ARCH_MAY_HAVE_PC_FDC
bool
default y
bool
default y
+config ARCH_HAS_ILOG2_U32
+ bool
+ default n
+
+config ARCH_HAS_ILOG2_U64
+ bool
+ default n
+
config SUN_PM
bool
default y
config SUN_PM
bool
default y
@@
-205,8
+220,8
@@
config SPARC_LED
tristate "Sun4m LED driver"
help
This driver toggles the front-panel LED on sun4m systems
tristate "Sun4m LED driver"
help
This driver toggles the front-panel LED on sun4m systems
- in a user-specif
yable manner. It'
s state can be probed
- by reading /proc/led and it
'
s blinking mode can be changed
+ in a user-specif
iable manner. It
s state can be probed
+ by reading /proc/led and its blinking mode can be changed
via writes to /proc/led
source "fs/Kconfig.binfmt"
via writes to /proc/led
source "fs/Kconfig.binfmt"
@@
-282,6
+297,13
@@
endmenu
source "fs/Kconfig"
source "fs/Kconfig"
+menu "Instrumentation Support"
+ depends on EXPERIMENTAL
+
+source "arch/sparc/oprofile/Kconfig"
+
+endmenu
+
source "arch/sparc/Kconfig.debug"
source "kernel/vserver/Kconfig"
source "arch/sparc/Kconfig.debug"
source "kernel/vserver/Kconfig"