projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-2.6'
[powerpc.git]
/
arch
/
sparc64
/
Kconfig
diff --git
a/arch/sparc64/Kconfig
b/arch/sparc64/Kconfig
index
c7a74e3
..
10b212a
100644
(file)
--- a/
arch/sparc64/Kconfig
+++ b/
arch/sparc64/Kconfig
@@
-72,6
+72,10
@@
config ARCH_NO_VIRT_TO_BUS
config OF
def_bool y
config OF
def_bool y
+config GENERIC_HARDIRQS_NO__DO_IRQ
+ bool
+ def_bool y
+
choice
prompt "Kernel page size"
default SPARC64_PAGE_SIZE_8KB
choice
prompt "Kernel page size"
default SPARC64_PAGE_SIZE_8KB
@@
-404,7
+408,7
@@
config SUNOS_EMUL
config SOLARIS_EMUL
tristate "Solaris binary emulation (EXPERIMENTAL)"
config SOLARIS_EMUL
tristate "Solaris binary emulation (EXPERIMENTAL)"
- depends on SPARC32_COMPAT && EXPERIMENTAL
+ depends on SPARC32_COMPAT &&
NET &&
EXPERIMENTAL
help
This is experimental code which will enable you to run (many)
Solaris binaries on your SPARC Linux machine.
help
This is experimental code which will enable you to run (many)
Solaris binaries on your SPARC Linux machine.
@@
-456,8
+460,6
@@
source "drivers/Kconfig"
source "drivers/sbus/char/Kconfig"
source "drivers/sbus/char/Kconfig"
-source "drivers/fc4/Kconfig"
-
source "fs/Kconfig"
source "kernel/Kconfig.instrumentation"
source "fs/Kconfig"
source "kernel/Kconfig.instrumentation"