From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 12 Jan 2006 20:23:49 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.16-rc1~179
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bf785ee0aeea7a3e717cb1e11df4135b6cbde7da;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm
---

bf785ee0aeea7a3e717cb1e11df4135b6cbde7da
diff --cc arch/arm/common/rtctime.c
index ffb82d5bede,00f6278f42b..48b1e19b131
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@@ -17,8 -17,8 +17,9 @@@
  #include <linux/proc_fs.h>
  #include <linux/miscdevice.h>
  #include <linux/spinlock.h>
 +#include <linux/capability.h>
  #include <linux/device.h>
+ #include <linux/mutex.h>
  
  #include <asm/rtc.h>
  #include <asm/semaphore.h>