git.openpandora.org
/
pandora-kernel.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/gregkh/usb-2.6
[pandora-kernel.git]
/
arch
/
um
/
Kconfig
diff --git
a/arch/um/Kconfig
b/arch/um/Kconfig
index
354cc6b
..
e6ff302
100644
(file)
--- a/
arch/um/Kconfig
+++ b/
arch/um/Kconfig
@@
-277,7
+277,9
@@
config HIGHMEM
config KERNEL_STACK_ORDER
int "Kernel stack size order"
config KERNEL_STACK_ORDER
int "Kernel stack size order"
- default 2
+ default 1 if 64BIT
+ range 1 10 if 64BIT
+ default 0 if !64BIT
help
This option determines the size of UML kernel stacks. They will
be 1 << order pages. The default is OK unless you're running Valgrind
help
This option determines the size of UML kernel stacks. They will
be 1 << order pages. The default is OK unless you're running Valgrind
@@
-320,21
+322,7
@@
source "crypto/Kconfig"
source "lib/Kconfig"
source "lib/Kconfig"
-menu "SCSI support"
-depends on BROKEN
-
-config SCSI
- tristate "SCSI support"
-
-# This gives us free_dma, which scsi.c wants.
-config GENERIC_ISA_DMA
- bool
- depends on SCSI
- default y
-
-source "arch/um/Kconfig.scsi"
-
-endmenu
+source "drivers/scsi/Kconfig"
source "drivers/md/Kconfig"
source "drivers/md/Kconfig"