Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
Russell King [Mon, 29 Dec 2008 18:08:11 +0000 (18:08 +0000)]
1  2 
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/time.c
drivers/video/Kconfig
drivers/video/pxafb.c
drivers/watchdog/sa1100_wdt.c

@@@ -22,9 -22,7 +22,8 @@@
  #include <asm/div64.h>
  #include <asm/mach/irq.h>
  #include <asm/mach/time.h>
 +#include <mach/hardware.h>
  #include <mach/pxa-regs.h>
- #include <asm/mach-types.h>
  
  /*
   * This is PXA's sched_clock implementation. This has a resolution
Simple merge
Simple merge
Simple merge