Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-timer

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

diff --cc arch/arm/mach-s3c2410/mach-h1940.c
Simple merge

diff --cc arch/arm/mach-s3c2410/s3c2410.h
index acff2c8896e4c218267902da93e0540f9557ff2b,55234af680948f922d55397b97da11906844b462..7d927da320100e02e29cc3eb6c71ec220c726b23
--- 1/arch/arm/mach-s3c2410/s3c2410.h
--- 2/arch/arm/mach-s3c2410/s3c2410.h
+++ b/arch/arm/mach-s3c2410/s3c2410.h
@@@ -15,15 -15,12 +15,16 @@@
   *     04-Sep-2004 BJD  Added s3c2410_init_uarts() call
  */
  
 +struct s3c2410_uartcfg;
 +
  extern void s3c2410_map_io(struct map_desc *, int count);
  
 +extern void s3c2410_init_uarts(struct s3c2410_uartcfg *, int no);
 +
  extern void s3c2410_init_irq(void);
  
- extern void s3c2410_init_time(void);
+ struct sys_timer;
+ extern struct sys_timer s3c2410_timer;
  
  /* the board structure is used at first initialsation time
   * to get info such as the devices to register for this

diff --cc arch/arm/mach-s3c2410/time.c
Simple merge