Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-microblaze.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a1e858e..2890d36 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -139,7 +139,6 @@ config PPC
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_MEMBARRIER_CALLBACKS
        select ARCH_HAS_SCALED_CPUTIME          if VIRT_CPU_ACCOUNTING_NATIVE && PPC64
-       select ARCH_HAS_SG_CHAIN
        select ARCH_HAS_STRICT_KERNEL_RWX       if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)
        select ARCH_HAS_TICK_BROADCAST          if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAS_UACCESS_FLUSHCACHE      if PPC64
@@ -169,6 +168,7 @@ config PPC
        select GENERIC_CPU_VULNERABILITIES      if PPC_BARRIER_NOSPEC
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
+       select GENERIC_PCI_IOMAP                if PCI
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
@@ -236,6 +236,8 @@ config PPC
        select OF_RESERVED_MEM
        select OLD_SIGACTION                    if PPC32
        select OLD_SIGSUSPEND
+       select PCI_DOMAINS                      if PCI
+       select PCI_SYSCALL                      if PCI
        select RTC_LIB
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
@@ -394,7 +396,7 @@ config HIGHMEM
        bool "High memory support"
        depends on PPC32
 
-source kernel/Kconfig.hz
+source "kernel/Kconfig.hz"
 
 config HUGETLB_PAGE_SIZE_VARIABLE
        bool
@@ -817,7 +819,7 @@ config ARCH_WANTS_FREEZER_CONTROL
        def_bool y
        depends on ADB_PMU
 
-source kernel/power/Kconfig
+source "kernel/power/Kconfig"
 
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
@@ -880,9 +882,6 @@ config PPC_INDIRECT_PCI
        depends on PCI
        default y if 40x || 44x
 
-config EISA
-       bool
-
 config SBUS
        bool
 
@@ -927,59 +926,20 @@ config FSL_GTM
        help
          Freescale General-purpose Timers support
 
-# Platforms that what PCI turned unconditionally just do select PCI
-# in their config node.  Platforms that want to choose at config
-# time should select PPC_PCI_CHOICE
-config PPC_PCI_CHOICE
-       bool
-
-config PCI
-       bool "PCI support" if PPC_PCI_CHOICE
-       default y if !40x && !CPM2 && !PPC_8xx && !PPC_83xx \
-               && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
-       select GENERIC_PCI_IOMAP
-       help
-         Find out whether your system includes a PCI bus. PCI is the name of
-         a bus system, i.e. the way the CPU talks to the other stuff inside
-         your box.  If you say Y here, the kernel will include drivers and
-         infrastructure code to support PCI bus devices.
-
-config PCI_DOMAINS
-       def_bool PCI
-
-config PCI_SYSCALL
-       def_bool PCI
-
 config PCI_8260
        bool
        depends on PCI && 8260
        select PPC_INDIRECT_PCI
        default y
 
-source "drivers/pci/Kconfig"
-
-source "drivers/pcmcia/Kconfig"
-
-config HAS_RAPIDIO
-       bool
-
-config RAPIDIO
-       tristate "RapidIO support"
-       depends on HAS_RAPIDIO || PCI
-       help
-         If you say Y here, the kernel will include drivers and
-         infrastructure code to support RapidIO interconnect devices.
-
 config FSL_RIO
        bool "Freescale Embedded SRIO Controller support"
-       depends on RAPIDIO = y && HAS_RAPIDIO
+       depends on RAPIDIO = y && HAVE_RAPIDIO
        default "n"
        ---help---
          Include support for RapidIO controller on Freescale embedded
          processors (MPC8548, MPC8641, etc).
 
-source "drivers/rapidio/Kconfig"
-
 endmenu
 
 config NONSTATIC_KERNEL