Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (82 commits)
  [ARM] Add comments marking in-use ptrace numbers
  [ARM] Move syscall saving out of the way of utrace
  [ARM] 4360/1: S3C24XX: regs-udc.h remove unused macro
  [ARM] 4358/1: S3C24XX: mach-qt2410.c: remove linux/mmc/protocol.h header
  [ARM] mm 10: allow memory type to be specified with ioremap
  [ARM] mm 9: add additional device memory types
  [ARM] mm 8: define mem_types table L1 bit 4 to be for ARMv6
  [ARM] iop: add missing parens in macro
  [ARM] mm 7: remove duplicated __ioremap() prototypes
  ARM: OMAP: fix OMAP1 mpuio suspend/resume oops
  ARM: OMAP: MPUIO wake updates
  ARM: OMAP: speed up gpio irq handling
  ARM: OMAP: plat-omap changes for 2430 SDP
  ARM: OMAP: gpio object shrinkage, cleanup
  ARM: OMAP: /sys/kernel/debug/omap_gpio
  ARM: OMAP: Implement workaround for GPIO wakeup bug in OMAP2420 silicon
  ARM: OMAP: Enable 24xx GPIO autoidling
  [ARM] 4318/2: DSM-G600 Board Support
  [ARM] 4227/1: minor head.S fixups
  [ARM] 4328/1: Move i.MX UART regs to driver
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db00376aca15..0d8fac3b0371 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -29,6 +29,10 @@ config GENERIC_TIME
         bool
         default n
 
+config GENERIC_CLOCKEVENTS
+        bool
+        default n
+
 config MMU
         bool
         default y
@@ -67,6 +71,14 @@ config GENERIC_HARDIRQS
         bool
         default y
 
+config STACKTRACE_SUPPORT
+        bool
+        default y
+
+config LOCKDEP_SUPPORT
+        bool
+        default y
+
 config TRACE_IRQFLAGS_SUPPORT
         bool
         default y
@@ -162,6 +174,8 @@ config ARCH_VERSATILE
         select ARM_AMBA
         select ARM_VIC
         select ICST307
+        select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
         help
           This enables support for ARM Ltd Versatile board.
 
@@ -263,6 +277,7 @@ config ARCH_IXP4XX
         bool "IXP4xx-based"
         depends on MMU
         select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -364,6 +379,7 @@ config ARCH_LH7A40X
 config ARCH_OMAP
         bool "TI OMAP"
         select GENERIC_GPIO
+        select GENERIC_TIME
         help
           Support for TI's OMAP platform (OMAP1 and OMAP2).
 
@@ -514,6 +530,8 @@ endmenu
 
 menu "Kernel Features"
 
+source "kernel/time/Kconfig"
+
 config SMP
         bool "Symmetric Multi-Processing (EXPERIMENTAL)"
         depends on EXPERIMENTAL && REALVIEW_MPCORE
@@ -573,6 +591,7 @@ config PREEMPT
 
 config NO_IDLE_HZ
         bool "Dynamic tick timer"
+        depends on !GENERIC_CLOCKEVENTS
         help
           Select this option if you want to disable continuous timer ticks
           and have them programmed to occur as required. This option saves
@@ -670,6 +689,7 @@ config LEDS_TIMER
         bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
                             MACH_OMAP_H2 || MACH_OMAP_PERSEUS2
         depends on LEDS
+        depends on !GENERIC_CLOCKEVENTS
         default y if ARCH_EBSA110
         help
           If you say Y here, one of the system LEDs (the green one on the