Pull pvops into release branch

[sfrench/cifs-2.6.git] / arch / arm / mach-sa1100 / Kconfig

diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index cd67ab1b217b7d9ae1478af363aaa7e646d8c866..81ffff7ed498a1633dac73b69b088d5a3e64acc1 100644 (file)
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -71,19 +71,9 @@ config SA1100_H3600
          <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600>
          <http://www.compaq.com/products/handhelds/pocketpc/>
 
-config SA1100_H3800
-       bool "Compaq iPAQ H3800"
-       help
-         Say Y here if you intend to run this kernel on the Compaq iPAQ H3800
-         series handheld computer.  Information about this machine and the
-         Linux port to this machine can be found at:
-
-         <http://www.handhelds.org/Compaq/index.html#iPAQ_H3800>
-         <http://www.compaq.com/products/handhelds/pocketpc/>
-
 config SA1100_H3XXX
        bool
-       depends on SA1100_H3100 || SA1100_H3600 || SA1100_H3800
+       depends on SA1100_H3100 || SA1100_H3600
        default y
 
 config SA1100_BADGE4
@@ -101,6 +91,16 @@ config SA1100_JORNADA720
          handheld computer.  See <http://www.hp.com/jornada/products/720>
          for details.
 
+config SA1100_JORNADA720_SSP
+       bool "HP Jornada 720 Extended SSP driver"
+       select SA1100_SSP
+       depends on SA1100_JORNADA720
+       help
+         Say Y here if you have a HP Jornada 7xx handheld computer and you
+         want to access devices connected to the MCU. Those include the
+         keyboard, touchscreen, backlight and battery. This driver also activates
+         the generic SSP which it extends.
+
 config SA1100_HACKKIT
        bool "HackKit Core CPU Board"
        help
@@ -145,17 +145,7 @@ config SA1100_SSP
        help
          Say Y here to enable support for the generic PIO SSP driver.
          This isn't for audio support, but for attached sensors and
-         other devices, eg for BadgePAD 4 sensor support, or Jornada
-         720 touchscreen support.
-
-config H3600_SLEEVE
-       tristate "Compaq iPAQ Handheld sleeve support"
-       depends on SA1100_H3100 || SA1100_H3600
-       help
-         Choose this option to enable support for extension packs (sleeves)
-         for the Compaq iPAQ H3XXX series of handheld computers.  This option
-         is required for the CF, PCMCIA, Bluetooth and GSM/GPRS extension
-         packs.
+         other devices, eg for BadgePAD 4 sensor support.
 
 endmenu