[POWERPC] spufs: Fix libassist accounting

[safe/jmp/linux-2.6] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 12830a7..cbfbd98 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -6,11 +6,6 @@ mainmenu "Linux/PowerPC Kernel Configuration"
 
 source "arch/powerpc/platforms/Kconfig.cputype"
 
-config PPC_PM_NEEDS_RTC_LIB
-       bool
-       select RTC_LIB
-       default y if PM
-
 config PPC32
        bool
        default y if !PPC64
@@ -424,10 +419,6 @@ config SBUS
 config FSL_SOC
        bool
 
-config FSL_PCIE
-       bool
-       depends on PPC_86xx
-
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
        bool
@@ -435,10 +426,10 @@ config MCA
 config PCI
        bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
                || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
-               || MPC7448HPC2 || PPC_PS3 || PPC_HOLLY
-       default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
+               || PPC_PS3
+       default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
-       default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
+       default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
        select ARCH_SUPPORTS_MSI
        help