---

yaml --- r: 289066 b: refs/heads/master c: d47908b h: refs/heads/master v: v3
git-mirror · Feb 10, 2012 · be4a611 · be4a611
1 parent 3bef806
commit be4a611
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf647ea717e529fc4f3dfa17dffd40da10522b00
+refs/heads/master: d47908b20c4cc22c2700ca737252bdc555d4f28a
diff --git a/trunk/drivers/staging/android/alarm-dev.c b/trunk/drivers/staging/android/alarm-dev.c
@@ -13,15 +13,14 @@
  *
  */
 
-#include <asm/mach/time.h>
+#include <linux/time.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/sysdev.h>
 #include <linux/uaccess.h>
 #include <linux/wakelock.h>
 #include "android_alarm.h"

diff --git a/trunk/drivers/staging/android/alarm.c b/trunk/drivers/staging/android/alarm.c
@@ -13,15 +13,14 @@
  *
  */
 
-#include <asm/mach/time.h>
+#include <linux/time.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/sysdev.h>
 #include <linux/wakelock.h>
 #include "android_alarm.h"