OSDN Git Service

(root) / android-x86 / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d9b810e)
fix compiling errors on x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 27 Oct 2010 07:51:41 +0000 (15:51 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 25 Jun 2012 13:03:06 +0000 (21:03 +0800)
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..f069dd5 100644 (file)
--- a/drivers/rtc/alarm-dev.c
+++ b/drivers/rtc/alarm-dev.c
@@ -13,7 +13,9 @@
  *
  */
 
+#ifndef __i386__
 #include <asm/mach/time.h>
+#endif
 #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..7adda70 100644 (file)
--- a/drivers/rtc/alarm.c
+++ b/drivers/rtc/alarm.c
@@ -13,7 +13,9 @@
  *
  */
 
+#ifndef __i386__
 #include <asm/mach/time.h>
+#endif
 #include <linux/android_alarm.h>
 #include <linux/device.h>
 #include <linux/miscdevice.h>
kernel
About OSDN
Find Software
Develop Software
Help