summaryrefslogtreecommitdiffstats
path: root/sound/drivers/pcsp/pcsp.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-18 11:16:55 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-18 11:16:55 +1000
commit4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch)
tree999c6a6580b76a083c8efb9dabff709d1c49fcd0 /sound/drivers/pcsp/pcsp.h
parent492b057c426e4aa747484958e18e9da29003985d (diff)
parent3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff)
downloadkernel-crypto-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.gz
kernel-crypto-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.xz
kernel-crypto-4b337c5f245b6587ba844ac7bb13c313a2912f7b.zip
Merge commit 'origin/master' into next
Diffstat (limited to 'sound/drivers/pcsp/pcsp.h')
-rw-r--r--sound/drivers/pcsp/pcsp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h
index cdef2664218..174dd2ff0f2 100644
--- a/sound/drivers/pcsp/pcsp.h
+++ b/sound/drivers/pcsp/pcsp.h
@@ -10,6 +10,7 @@
#define __PCSP_H__
#include <linux/hrtimer.h>
+#include <linux/timex.h>
#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
/* Use the global PIT lock ! */
#include <asm/i8253.h>