projects / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0f7a0b0)
fix android added armisms in alarm code
authormgross <mark.gross@intel.com>
Mon, 18 Jul 2011 21:13:17 +0000 (14:13 -0700)
committermgross <mark.gross@intel.com>
Wed, 9 Nov 2011 20:36:05 +0000 (12:36 -0800)
Change-Id: I9a5bd859b0c49071e79a24e9582e43415adda843

drivers/rtc/alarm-dev.c patch | blob | history
drivers/rtc/alarm.c patch | blob | history

diff --git a/drivers/rtc/alarm-dev.c b/drivers/rtc/alarm-dev.c
index 686e6f7..877a42a 100644 (file)
--- a/drivers/rtc/alarm-dev.c
+++ b/drivers/rtc/alarm-dev.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include <asm/mach/time.h>
+/*#include <asm/mach/time.h> */
 #include <linux/android_alarm.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c
index 28b0df8..234b13c 100644 (file)
--- a/drivers/rtc/alarm.c
+++ b/drivers/rtc/alarm.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include <asm/mach/time.h>
+/*#include <asm/mach/time.h>*/
 #include <linux/android_alarm.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
Domain: System / Kernel;