aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-12 20:36:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-13 07:32:15 -0700
commitee6baf884b27739cca110e5167a2edfa061ca19f (patch)
tree27db3ed3a2d2c441fe0cda5811954421b5e0512c /include/linux
parent7f1cbe51ffc1273bcded36742ede4b6ebef1b640 (diff)
[PATCH] headers_check: remove <asm/timex.h> from user export
There's useful stuff in <linux/timex.h> but <asm/timex.h> has nothing for userspace. Stop exporting it, and include it only from within the existing #ifdef __KERNEL__ part of <linux/timex.h> This fixes a 'make headers_check' failure on i386 because asm-i386/timex.h includes both asm-i386/tsc.h and asm-i386/processor.h, neither of which are exported to userspace. It's not entirely clear _why_ it includes either of these, but it does. Signed-off-by: David Woodhouse <dwmw2@infradead.org> 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/timex.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 19bb6538b49..d543d3871e3 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -57,7 +57,6 @@
#include <linux/time.h>
#include <asm/param.h>
-#include <asm/timex.h>
/*
* SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
@@ -191,6 +190,8 @@ struct timex {
#define TIME_BAD TIME_ERROR /* bw compat */
#ifdef __KERNEL__
+#include <asm/timex.h>
+
/*
* kernel variables
* Note: maximum error = NTP synch distance = dispersion + delay / 2;