aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-02-09 14:24:33 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-10 10:06:19 -0800
commitd47908b20c4cc22c2700ca737252bdc555d4f28a (patch)
treea90a0e806b05ad79cfacd3b5016d064e4347b891
parentstaging: android-alarm: Add needed module.h includes (diff)
downloadlinux-dev-d47908b20c4cc22c2700ca737252bdc555d4f28a.tar.xz
linux-dev-d47908b20c4cc22c2700ca737252bdc555d4f28a.zip
staging: android-alarm: Fix include compile issues
The file asm/mach/time.h doesn't exist on all arches, so include <linux/time.h>. Also linux/sysdev.h is gone so kill it. CC: Arve Hjønnevåg <arve@android.com> CC: Android Kernel Team <kernel-team@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/alarm-dev.c3
-rw-r--r--drivers/staging/android/alarm.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 7391f4090396..80ea85086e45 100644
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -13,7 +13,7 @@
*
*/
-#include <asm/mach/time.h>
+#include <linux/time.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/miscdevice.h>
@@ -21,7 +21,6 @@
#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/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c
index c16032b85d26..7aaf5b8aa4f0 100644
--- a/drivers/staging/android/alarm.c
+++ b/drivers/staging/android/alarm.c
@@ -13,7 +13,7 @@
*
*/
-#include <asm/mach/time.h>
+#include <linux/time.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/miscdevice.h>
@@ -21,7 +21,6 @@
#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
-#include <linux/sysdev.h>
#include <linux/wakelock.h>
#include "android_alarm.h"