[PATCH 6/6] hwclock: Don't use asm/io.h if sys/io.h can't be found

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Josiah Worcester <josiahw@xxxxxxxxx>
---
 hwclock/cmos.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/hwclock/cmos.c b/hwclock/cmos.c
index 947b21b..b5169a1 100644
--- a/hwclock/cmos.c
+++ b/hwclock/cmos.c
@@ -53,7 +53,12 @@
 #ifdef HAVE_SYS_IO_H
 #include <sys/io.h>
 #else
-#include <asm/io.h>		/* for inb, outb */
+/* Disable cmos access; we can no longer use asm/io.h, since
+ * the kernel does not export that header.
+ */
+#undef __i386__
+void outb(int a, int b){}
+int inb(int c){ return 0; }
 #endif
 #elif defined(__alpha__)
 /* <asm/io.h> fails to compile, probably because of u8 etc */
-- 
1.7.5.3

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux