Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

[pandora-kernel.git] / arch / powerpc / platforms / embedded6xx / Kconfig

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 234a861..ddbe398 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -74,6 +74,18 @@ config SANDPOINT
          Select SANDPOINT if configuring for a Motorola Sandpoint X3
          (any flavor).
 
+config LINKSTATION
+       bool "Linkstation / Kurobox(HG) from Buffalo"
+       select MPIC
+       select FSL_SOC
+       select PPC_UDBG_16550 if SERIAL_8250
+       help
+         Select LINKSTATION if configuring for one of PPC- (MPC8241)
+         based NAS systems from Buffalo Technology. So far only
+         KuroboxHG has been tested. In the future classical Kurobox,
+         Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
+         Terastation systems should be supported too.
+
 config MPC7448HPC2
        bool "Freescale MPC7448HPC2(Taiga)"
        select TSI108_BRIDGE
@@ -146,15 +158,6 @@ config PQ2FADS
          Select PQ2FADS if you wish to configure for a Freescale
          PQ2FADS board (-VR or -ZU).
 
-config LITE5200
-       bool "Freescale LITE5200 / (IceCube)"
-       select PPC_MPC52xx
-       help
-         Support for the LITE5200 dev board for the MPC5200 from Freescale.
-         This is for the LITE5200 version 2.0 board. Don't know if it changes
-         much but it's only been tested on this board version. I think this
-         board is also known as IceCube.
-
 config EV64360
        bool "Marvell-EV64360BP"
        help
@@ -172,9 +175,6 @@ config TQM8xxL
        depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
        default y
 
-config PPC_MPC52xx
-       bool
-
 config 8260
        bool "CPM2 Support" if WILLOW
        depends on 6xx
@@ -208,7 +208,7 @@ config PPC_GEN550
        depends on SANDPOINT || SPRUCE || PPLUS || \
                PRPMC750 || PRPMC800 || LOPEC || \
                (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
-               83xx
+               83xx || LINKSTATION
        default y
 
 config FORCE
@@ -282,13 +282,13 @@ config EPIC_SERIAL_MODE
 
 config MPC10X_BRIDGE
        bool
-       depends on POWERPMC250 || LOPEC || SANDPOINT
+       depends on POWERPMC250 || LOPEC || SANDPOINT || LINKSTATION
        select PPC_INDIRECT_PCI
        default y
 
 config MPC10X_OPENPIC
        bool
-       depends on POWERPMC250 || LOPEC || SANDPOINT
+       depends on POWERPMC250 || LOPEC || SANDPOINT || LINKSTATION
        default y
 
 config MPC10X_STORE_GATHERING