1 files changed, 19 insertions, 6 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 17d3fbd368a3..f4533f8ff4e8 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -51,6 +51,12 @@ config MACH_INTELMOTE2
         select IWMMXT
         select PXA_HAVE_BOARD_IRQS
 
+config MACH_STARGATE2
+        bool "Intel Stargate 2 Platform"
+        select PXA27x
+        select IWMMXT
+        select PXA_HAVE_BOARD_IRQS
+
 config ARCH_LUBBOCK
         bool "Intel DBPXA250 Development Platform"
         select PXA25x
@@ -88,6 +94,10 @@ config PXA_SHARPSL
           SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
           handheld computer.
 
+config SHARPSL_PM
+        bool
+        select APM_EMULATION
+
 config CORGI_SSP_DEPRECATED
         bool
         select PXA_SSP
@@ -280,6 +290,7 @@ config MACH_ZYLONITE
         select PXA3xx
         select PXA_SSP
         select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
 
 config MACH_LITTLETON
         bool "PXA3xx Form Factor Platform (aka Littleton)"
@@ -308,6 +319,14 @@ config MACH_CM_X300
         select PXA3xx
         select CPU_PXA300
 
+config MACH_H4700
+        bool "HP iPAQ hx4700"
+        select PXA27x
+        select IWMMXT
+        select PXA_SSP
+        select HAVE_PWM
+        select PXA_HAVE_BOARD_IRQS
+
 config MACH_MAGICIAN
         bool "Enable HTC Magician Support"
         select PXA27x
@@ -505,12 +524,6 @@ config PXA_SSP
         help
           Enable support for PXA2xx SSP ports
 
-config PXA_PWM
-        tristate
-        default BACKLIGHT_PWM
-        help
-          Enable support for PXA2xx/PXA3xx PWM controllers
-
 config TOSA_BT
         tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
         depends on MACH_TOSA