Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d920baed109a..b1091d7542ce 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -164,6 +164,7 @@ config SYSCTL
 
 config AUDIT
         bool "Auditing support"
+        depends on NET
         default y if SECURITY_SELINUX
         help
           Enable auditing infrastructure that can be used with another
@@ -173,7 +174,7 @@ config AUDIT
 
 config AUDITSYSCALL
         bool "Enable system-call auditing support"
-        depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML)
+        depends on AUDIT && (X86 || PPC || PPC64 || ARCH_S390 || IA64 || UML)
         default y if SECURITY_SELINUX
         help
           Enable low-overhead system-call auditing infrastructure that
@@ -442,7 +443,7 @@ config OBSOLETE_MODPARM
 
 config MODVERSIONS
         bool "Module versioning support (EXPERIMENTAL)"
-        depends on MODULES && EXPERIMENTAL && !UML
+        depends on MODULES && EXPERIMENTAL
         help
           Usually, you have to use modules compiled with your kernel.
           Saying Y here makes it sometimes possible to use modules