Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux...

* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: apb: Share APB timer code with other platforms

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/apb_timer.h
Simple merge

diff --cc arch/x86/kernel/apb_timer.c
index 2b6630d,033d3ec..afdc3f7
--- 1/arch/x86/kernel/apb_timer.c
--- 2/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@@ -44,23 -41,16 +41,17 @@@
  #include <asm/fixmap.h>
  #include <asm/apb_timer.h>
  #include <asm/mrst.h>
 +#include <asm/time.h>
  
- #define APBT_MASK                     CLOCKSOURCE_MASK(32)
- #define APBT_SHIFT                    22
  #define APBT_CLOCKEVENT_RATING                110
  #define APBT_CLOCKSOURCE_RATING               250
- #define APBT_MIN_DELTA_USEC           200
  
- #define EVT_TO_APBT_DEV(evt) container_of(evt, struct apbt_dev, evt)
  #define APBT_CLOCKEVENT0_NUM   (0)
- #define APBT_CLOCKEVENT1_NUM   (1)
  #define APBT_CLOCKSOURCE_NUM   (2)
  
- static unsigned long apbt_address;
+ static phys_addr_t apbt_address;
  static int apb_timer_block_enabled;
  static void __iomem *apbt_virt_address;
- static int phy_cs_timer_id;
  
  /*
   * Common DW APB timer info

diff --cc drivers/clocksource/Kconfig
index d8d3e02,141417f..34e9c4f
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -1,14 -1,8 +1,17 @@@
  config CLKSRC_I8253
        bool
  
 +config CLKEVT_I8253
 +      bool
 +
 +config I8253_LOCK
 +      bool
 +
 +config CLKBLD_I8253
 +      def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK
 +
  config CLKSRC_MMIO
        bool
+ 
+ config DW_APB_TIMER
+       bool

diff --cc drivers/clocksource/Makefile
index 7922a0c,4c3d8fd..85ad164
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -6,5 -6,6 +6,6 @@@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC)     +
  obj-$(CONFIG_SH_TIMER_CMT)    += sh_cmt.o
  obj-$(CONFIG_SH_TIMER_MTU2)   += sh_mtu2.o
  obj-$(CONFIG_SH_TIMER_TMU)    += sh_tmu.o
 -obj-$(CONFIG_CLKSRC_I8253)    += i8253.o
 +obj-$(CONFIG_CLKBLD_I8253)    += i8253.o
  obj-$(CONFIG_CLKSRC_MMIO)     += mmio.o
+ obj-$(CONFIG_DW_APB_TIMER)    += dw_apb_timer.o