projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
arch
/
um
/
Kconfig
diff --git
a/arch/um/Kconfig
b/arch/um/Kconfig
index
f945444
..
684e1f8
100644
(file)
--- a/
arch/um/Kconfig
+++ b/
arch/um/Kconfig
@@
-73,7
+73,7
@@
config MODE_SKAS
to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this
option will shrink the UML binary slightly.
to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this
option will shrink the UML binary slightly.
-source "arch/um/Kconfig
_
arch"
+source "arch/um/Kconfig
.
arch"
source "mm/Kconfig"
config LD_SCRIPT_STATIC
source "mm/Kconfig"
config LD_SCRIPT_STATIC
@@
-196,7
+196,7
@@
config HOST_2G_2G
config SMP
bool "Symmetric multi-processing support (EXPERIMENTAL)"
default n
config SMP
bool "Symmetric multi-processing support (EXPERIMENTAL)"
default n
- depends on
MODE_TT && EXPERIMENTAL
+ depends on
(MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN)
help
This option enables UML SMP support.
It is NOT related to having a real SMP box. Not directly, at least.
help
This option enables UML SMP support.
It is NOT related to having a real SMP box. Not directly, at least.
@@
-279,7
+279,7
@@
source "net/Kconfig"
source "drivers/base/Kconfig"
source "drivers/base/Kconfig"
-source "arch/um/Kconfig
_
char"
+source "arch/um/Kconfig
.
char"
source "drivers/block/Kconfig"
source "drivers/block/Kconfig"
@@
-287,7
+287,7
@@
config NETDEVICES
bool
default NET
bool
default NET
-source "arch/um/Kconfig
_
net"
+source "arch/um/Kconfig
.
net"
source "drivers/net/Kconfig"
source "drivers/net/Kconfig"
@@
-311,7
+311,7
@@
config GENERIC_ISA_DMA
depends on SCSI
default y
depends on SCSI
default y
-source "arch/um/Kconfig
_
scsi"
+source "arch/um/Kconfig
.
scsi"
endmenu
endmenu