Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[sfrench/cifs-2.6.git] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index f6db3b385fea4c02c4091371743c34e4ddb4facb..e3f1ce33e64251a62502bfead0eab6102f6ee4fd 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -47,6 +47,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
 
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       default y
+
 source "init/Kconfig"
 
 menu "Processor"
@@ -330,14 +334,6 @@ config RPXLITE
          End of life: end 2000 ?
          URL: see TQM850L
 
-         SPD823TS:
-         MPC823 based board used in the "Tele Server" product
-         Manufacturer: Speech Design, <http://www.speech-design.de/>
-         Date of Release: Mid 2000 (?)
-         End of life: -
-         URL: <http://www.speech-design.de/>
-         select "English", then "Teleteam Solutions", then "TeleServer"
-
          IVMS8:
          MPC860 based board used in the "Integrated Voice Mail System",
          Small Version (8 voice channels)
@@ -354,13 +350,6 @@ config RPXLITE
          End of life: -
          URL: <http://www.speech-design.de/>
 
-         SM850:
-         Service Module (based on TQM850L)
-         Manufacturer: Dependable Computer Systems, <http://www.decomsys.com/>
-         Date of Release: end 2000 (?)
-         End of life: mid 2001 (?)
-         URL: <http://www.tz-mikroelektronik.de/ServiceModule/index.html>
-
          HERMES:
          Hermes-Pro ISDN/LAN router with integrated 8 x hub
          Manufacturer: Multidata Gesellschaft fur Datentechnik und Informatik
@@ -464,13 +453,6 @@ config TQM860L
 config FPS850L
        bool "FPS850L"
 
-config SPD823TS
-       bool "SPD823TS"
-       help
-         Say Y here to support the Speech Design 823 Tele-Server from Speech
-         Design, released in 2000.  The manufacturer's website is at
-         <http://www.speech-design.de/>.
-
 config IVMS8
        bool "IVMS8"
        help
@@ -485,14 +467,6 @@ config IVML24
          from Speech Design, released March 2001.  The manufacturer's website
          is at <http://www.speech-design.de/>.
 
-config SM850
-       bool "SM850"
-       help
-         Say Y here to support the Service Module 850 from Dependable
-         Computer Systems, an SBC based on the TQM850L module by TQ
-         Components.  This board is no longer in production.  The
-         manufacturer's website is at <http://www.decomsys.com/>.
-
 config HERMES_PRO
        bool "HERMES"
 
@@ -578,9 +552,6 @@ config CPCI690
        help
          Select CPCI690 if configuring a Force CPCI690 cPCI board.
 
-config PCORE
-       bool "Force-PowerCore"
-
 config POWERPMC250
        bool "Force-PowerPMC250"
 
@@ -613,9 +584,6 @@ config EV64260
 config LOPEC
        bool "Motorola-LoPEC"
 
-config MCPN765
-       bool "Motorola-MCPN765"
-
 config MVME5100
        bool "Motorola-MVME5100"
 
@@ -637,12 +605,6 @@ config SANDPOINT
 config RADSTONE_PPC7D
        bool "Radstone Technology PPC7D board"
 
-config ADIR
-       bool "SBS-Adirondack"
-
-config K2
-       bool "SBS-K2"
-
 config PAL4
        bool "SBS-Palomar4"
 
@@ -713,6 +675,16 @@ config MPC834x_SYS
        help
          This option enables support for the MPC 834x SYS evaluation board.
 
+         Be aware that PCI buses can only function when SYS board is plugged
+         into the PIB (Platform IO Board) board from Freescale which provide
+         3 PCI slots.  The PIBs PCI initialization is the bootloader's
+         responsiblilty.
+
+config EV64360
+       bool "Marvell-EV64360BP"
+       help
+         Select EV64360 if configuring a Marvell EV64360BP Evaluation
+         platform.
 endchoice
 
 config PQ2ADS
@@ -722,7 +694,7 @@ config PQ2ADS
 
 config TQM8xxL
        bool
-       depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L || SM850)
+       depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
        default y
 
 config EMBEDDEDBOOT
@@ -796,15 +768,15 @@ config PPC_OF
 
 config PPC_GEN550
        bool
-       depends on SANDPOINT || MCPN765 || SPRUCE || PPLUS || PCORE || \
-               PRPMC750 || K2 || PRPMC800 || LOPEC || \
+       depends on SANDPOINT || SPRUCE || PPLUS || \
+               PRPMC750 || PRPMC800 || LOPEC || \
                (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
                83xx
        default y
 
 config FORCE
        bool
-       depends on 6xx && (PCORE || POWERPMC250)
+       depends on 6xx && POWERPMC250
        default y
 
 config GT64260
@@ -814,7 +786,7 @@ config GT64260
 
 config MV64360         # Really MV64360 & MV64460
        bool
-       depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU
+       depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU || EV64360
        default y
 
 config MV64X60
@@ -867,7 +839,7 @@ config EPIC_SERIAL_MODE
 
 config MPC10X_BRIDGE
        bool
-       depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT
+       depends on POWERPMC250 || LOPEC || SANDPOINT
        default y
 
 config MPC10X_OPENPIC
@@ -886,10 +858,6 @@ config SANDPOINT_ENABLE_UART1
          If this option is enabled then the MPC824x processor will run
          in DUART mode instead of UART mode.
 
-config CPC710_DATA_GATHERING
-       bool "Enable CPC710 data gathering"
-       depends on K2
-
 config HARRIER_STORE_GATHERING
        bool "Enable Harrier store gathering"
        depends on HARRIER
@@ -911,6 +879,7 @@ config PPCBUG_NVRAM
        default y if PPC_PREP
 
 config SMP
+       depends on PPC_STD_MMU
        bool "Symmetric multi-processing support"
        ---help---
          This enables support for systems with more than one CPU. If you have
@@ -930,7 +899,7 @@ config SMP
 
 config IRQ_ALL_CPUS
        bool "Distribute interrupts on all CPUs by default"
-       depends on SMP
+       depends on SMP && !MV64360
        help
          This option gives the kernel permission to distribute IRQs across
          multiple CPUs.  Saying N here will route all IRQs to the first
@@ -1121,7 +1090,9 @@ config PROC_HARDWARE
 
 source "drivers/zorro/Kconfig"
 
+if !44x || BROKEN
 source kernel/power/Kconfig
+endif
 
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
@@ -1191,6 +1162,11 @@ config PCI_DOMAINS
        bool
        default PCI
 
+config MPC83xx_PCI2
+       bool "  Supprt for 2nd PCI host controller"
+       depends on PCI && MPC834x
+       default y if MPC834x_SYS
+
 config PCI_QSPAN
        bool "QSpan PCI"
        depends on !4xx && !CPM2 && 8xx