---

yaml --- r: 19619 b: refs/heads/master c: 6d7bfd1 h: refs/heads/master i: 19617: 5e17b2f 19615: 4bb7e32 v: v3
git-mirror · Feb 3, 2006 · 50eb9b6 · 50eb9b6
1 parent 158eb0c
commit 50eb9b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12c3a54848a6eba2b38cd92ba5925433d223332b
+refs/heads/master: 6d7bfd14e593455a0801c62db86f82912c52c3a1
diff --git a/trunk/include/asm-s390/timer.h b/trunk/include/asm-s390/timer.h
@@ -1,7 +1,7 @@
 /*
  *  include/asm-s390/timer.h
  *
- *  (C) Copyright IBM Corp. 2003
+ *  (C) Copyright IBM Corp. 2003,2006
  *  Virtual CPU timer
  *
  *  Author: Jan Glauber (jang@de.ibm.com)
@@ -10,6 +10,8 @@
 #ifndef _ASM_S390_TIMER_H
 #define _ASM_S390_TIMER_H
 
+#ifdef __KERNEL__
+
 #include <linux/timer.h>
 
 #define VTIMER_MAX_SLICE (0x7ffffffffffff000LL)
@@ -43,4 +45,6 @@ extern void add_virt_timer_periodic(void *new);
 extern int mod_virt_timer(struct vtimer_list *timer, __u64 expires);
 extern int del_virt_timer(struct vtimer_list *timer);
 
-#endif
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_S390_TIMER_H */