Merge branch 'x86/urgent' into core/signal

[mv-sheeva.git] / arch / sh / cchips / Kconfig

diff --git a/arch/sh/cchips/Kconfig b/arch/sh/cchips/Kconfig
index 0582ca8346b697e99a21f24208e2c3c22231fe86..7892361eedc8fb6a414a566b093d49c6a7f8c7cf 100644 (file)
--- a/arch/sh/cchips/Kconfig
+++ b/arch/sh/cchips/Kconfig
@@ -1,22 +1,7 @@
 menu "Companion Chips"
 
-config VOYAGERGX
-       bool "VoyagerGX chip support"
-       depends on SH_RTS7751R2D
-       help
-         Selecting this option will support Silicon Motion, Inc. SM501.
-         Designed to complement needs for the embedded industry, it
-         provides video and 2D capability. To reduce system cost a
-         wide variety of include I/O is supported, including analog RGB
-         and digital LCD Panel interface, 8-bit parallel interface, USB,
-         UART, IrDA, Zoom Video, AC97 or I2S, SSP, PWM, and I2C. There
-         are additional GPIO bits that can be used to interface to
-         external as well.
-
-# A board must have defined HD6446X_SERIES in order to see these
 config HD6446X_SERIES
-       bool "HD6446x support"
-       default n
+       bool
 
 choice
        prompt "HD6446x options"
@@ -25,7 +10,6 @@ choice
 
 config HD64461
        bool "Hitachi HD64461 companion chip support"
-       depends on CPU_SUBTYPE_SH7709
        ---help---
          The Hitachi HD64461 provides an interface for
          the SH7709 CPU, supporting a LCD controller,
@@ -40,7 +24,6 @@ config HD64461
 
 config HD64465
        bool "Hitachi HD64465 companion chip support"
-       depends on CPU_SUBTYPE_SH7750
        ---help---
          The Hitachi HD64465 provides an interface for
          the SH7750 CPU, supporting a LCD controller,