summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMichael Obster <kernel@obster.org>2004-11-21 16:44:01 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-21 16:44:01 -0800
commit4c089f74e9901c4b3fb85f6f461270e3dbecfed0 (patch)
tree0c2a04eb6b0486c68c273748c76a3f8c6750deb3 /include/linux
parent95d8c557252b956d7719df4cb516d89d204d2da1 (diff)
[PATCH] mc146818rtc.h include fix
Prevents user-space including spinlock.h which breaks the build. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mc146818rtc.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index cde7dbae375e..bbc93ae217e1 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -13,10 +13,12 @@
#include <asm/io.h>
#include <linux/rtc.h> /* get the user-level API */
-#include <linux/spinlock.h> /* spinlock_t */
#include <asm/mc146818rtc.h> /* register access macros */
+#ifdef __KERNEL__
+#include <linux/spinlock.h> /* spinlock_t */
extern spinlock_t rtc_lock; /* serialize CMOS RAM access */
+#endif
/**********************************************************************
* register summary