Merge master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6

[linux-2.6] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 7a117ef473c5f46c64d711a2753c1e7a1abf5327..aba05394d30a05603685e2bcc62cc9c2b85b4d3b 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -211,6 +211,10 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       default y
+
 config SUN_PM
        bool
        default y
@@ -268,6 +272,8 @@ source "mm/Kconfig"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 if !SUN4