Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux-2.6] / arch / ppc64 / Kconfig

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 4d4f81c6501267a58b283e64e89eec5f557722ec..deca68ad644ae41681537867c7e8accdb6d2a18b 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -44,6 +44,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
 
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       default y
+
 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1
@@ -302,12 +306,6 @@ config GENERIC_HARDIRQS
        bool
        default y
 
-config MSCHUNKS
-       bool
-       depends on PPC_ISERIES
-       default y
-
-
 config PPC_RTAS
        bool
        depends on PPC_PSERIES || PPC_BPA