ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU

[net-next-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 62065531b63994694b89ef881d95ad87cd57287d..98922f7d2d1236dd7fd29fa404447b46189c0222 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -955,7 +955,8 @@ config XSCALE_PMU
        default y
 
 config CPU_HAS_PMU
-       depends on CPU_V6 || CPU_V7 || XSCALE_PMU
+       depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \
+                  (!ARCH_OMAP3 || OMAP3_EMU)
        default y
        bool
 
@@ -1421,6 +1422,17 @@ config CMDLINE
          time by entering them here. As a minimum, you should specify the
          memory size and the root device (e.g., mem=64M root=/dev/nfs).
 
+config CMDLINE_FORCE
+       bool "Always use the default kernel command string"
+       depends on CMDLINE != ""
+       help
+         Always use the default kernel command string, even if the boot
+         loader passes other arguments to the kernel.
+         This is useful if you cannot or don't want to change the
+         command-line options your boot loader passes to the kernel.
+
+         If unsure, say N.
+
 config XIP_KERNEL
        bool "Kernel Execute-In-Place from ROM"
        depends on !ZBOOT_ROM