projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew Morton)
[cascardo/linux.git]
/
init
/
Kconfig
diff --git
a/init/Kconfig
b/init/Kconfig
index
841e79c
..
5496f30
100644
(file)
--- a/
init/Kconfig
+++ b/
init/Kconfig
@@
-118,7
+118,6
@@
config HAVE_KERNEL_LZ4
choice
prompt "Kernel compression mode"
default KERNEL_GZIP
choice
prompt "Kernel compression mode"
default KERNEL_GZIP
- depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4
help
The linux kernel is a kind of self-extracting executable.
Several compression algorithms are available, which differ
help
The linux kernel is a kind of self-extracting executable.
Several compression algorithms are available, which differ
@@
-137,6
+136,13
@@
choice
If in doubt, select 'gzip'
If in doubt, select 'gzip'
+config KERNEL_UNCOMPRESSED
+ bool "No compression"
+ help
+ No compression at all. The kernel is huge but the compression and
+ decompression times are zero.
+ This is usually not what you want.
+
config KERNEL_GZIP
bool "Gzip"
depends on HAVE_KERNEL_GZIP
config KERNEL_GZIP
bool "Gzip"
depends on HAVE_KERNEL_GZIP
@@
-284,7
+290,7
@@
config AUDIT
config AUDITSYSCALL
bool "Enable system-call auditing support"
config AUDITSYSCALL
bool "Enable system-call auditing support"
- depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))
+ depends on AUDIT && (X86 || P
ARISC || P
PC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))
default y if SECURITY_SELINUX
help
Enable low-overhead system-call auditing infrastructure that
default y if SECURITY_SELINUX
help
Enable low-overhead system-call auditing infrastructure that