[media] soc_camera: Don't use module names to load I2C modules

[mv-sheeva.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 14b9bc13500114269d19ca285e17a693dd5c2d56..7aefb90748527ae5b68550b7e311d1244b55639d 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -347,6 +347,9 @@ config ARCH_PXA_PALM
        bool "PXA based Palm PDAs"
        select HAVE_PWM
 
+config MACH_PALM27X
+       bool
+
 config MACH_PALMTE2
        bool "Palm Tungsten|E2"
        default y
@@ -371,6 +374,7 @@ config MACH_PALMT5
        depends on ARCH_PXA_PALM
        select PXA27x
        select IWMMXT
+       select MACH_PALM27X
        help
          Say Y here if you intend to run this kernel on a Palm Tungsten|T5
          handheld computer.
@@ -381,6 +385,7 @@ config MACH_PALMTX
        depends on ARCH_PXA_PALM
        select PXA27x
        select IWMMXT
+       select MACH_PALM27X
        help
          Say Y here if you intend to run this kernel on a Palm T|X
          handheld computer.
@@ -391,6 +396,7 @@ config MACH_PALMZ72
        depends on ARCH_PXA_PALM
        select PXA27x
        select IWMMXT
+       select MACH_PALM27X
        help
          Say Y here if you intend to run this kernel on Palm Zire 72
          handheld computer.
@@ -401,6 +407,7 @@ config MACH_PALMLD
        depends on ARCH_PXA_PALM
        select PXA27x
        select IWMMXT
+       select MACH_PALM27X
        help
          Say Y here if you intend to run this kernel on a Palm LifeDrive
          handheld computer.
@@ -458,6 +465,14 @@ config PXA_SHARPSL
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
 
+config PXA_SHARPSL_DETECT_MACH_ID
+       bool "Detect machine ID at run-time in the decompressor"
+       depends on PXA_SHARPSL
+       help
+         Say Y here if you want the zImage decompressor to detect
+         the Zaurus machine ID at run-time. For latest kexec-based
+         boot loader, this is not necessary.
+
 config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
        depends on PXA_SHARPSL
@@ -674,7 +689,6 @@ config SHARPSL_PM
 
 config SHARPSL_PM_MAX1111
        bool
-       depends on !CORGI_SSP_DEPRECATED
        select HWMON
        select SENSORS_MAX1111