From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 29 Dec 2008 18:08:11 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=47992cbdaef2f18a47871b2ed01ad27f568c8b73;p=deliverable%2Flinux.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
---

47992cbdaef2f18a47871b2ed01ad27f568c8b73
diff --cc arch/arm/mach-pxa/time.c
index ef4ddf9d5040,986d494a1834..001624158519
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.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