X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=init%2FKconfig;h=df55b36656010b726aeb8b7a3e08984e2940a8da;hb=3965f8c59778b0d37460ec268f92c0c382546b5c;hp=df864a3582217b648786ff3ad48d2ce64fe6457e;hpb=050335db2a777ffaa859d77beb05fffe9e8c5ae9;p=powerpc.git

diff --git a/init/Kconfig b/init/Kconfig
index df864a3582..df55b36656 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,3 +1,11 @@
+config DEFCONFIG_LIST
+	string
+	option defconfig_list
+	default "/lib/modules/$UNAME_RELEASE/.config"
+	default "/etc/kernel-config"
+	default "/boot/config-$UNAME_RELEASE"
+	default "arch/$ARCH/defconfig"
+
 menu "Code maturity level options"
 
 config EXPERIMENTAL
@@ -151,7 +159,8 @@ config BSD_PROCESS_ACCT_V3
 	  at <http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/>.
 
 config SYSCTL
-	bool "Sysctl support"
+	bool "Sysctl support" if EMBEDDED
+	default y
 	---help---
 	  The sysctl interface provides a means of dynamically changing
 	  certain kernel parameters and variables on the fly without requiring
@@ -235,16 +244,6 @@ config UID16
 	help
 	  This enables the legacy 16-bit UID syscall wrappers.
 
-config VM86
-	depends X86
-	default y
-	bool "Enable VM86 support" if EMBEDDED
-	help
-          This option is required by programs like DOSEMU to run 16-bit legacy
-	  code on X86 processors. It also may be needed by software like
-          XFree86 to initialize some video cards via BIOS. Disabling this
-          option saves about 6k.
-
 config CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size (Look out for broken compilers!)"
 	default y