Merge branch 'upstream' into upstream-jgarzik
[powerpc.git] / arch / powerpc / platforms / embedded6xx / Kconfig
index ddbe398..886c522 100644 (file)
@@ -35,7 +35,7 @@ config HDPU
          Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-       depends HDPU
+       depends on HDPU
        tristate "HDPU-Features"
        help
          Select to enable HDPU enhanced features.
@@ -104,15 +104,6 @@ config RADSTONE_PPC7D
 config PAL4
        bool "SBS-Palomar4"
 
-config GEMINI
-       bool "Synergy-Gemini"
-       select PPC_INDIRECT_PCI
-       depends on BROKEN
-       help
-         Select Gemini if configuring for a Synergy Microsystems' Gemini
-         series Single Board Computer.  More information is available at:
-         <http://www.synergymicro.com/PressRel/97_10_15.html>.
-
 config EST8260
        bool "EST8260"
        ---help---