]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 29 Dec 2008 18:08:11 +0000 (18:08 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
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

index ef4ddf9d5040b7479f0a95f235d5de617ba8bdf5,986d494a1834ffda50cc955c0b1902e14d1baeb4..0016241585190e3770de17ac6e02b0db57547a2f
@@@ -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