git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.31-rc1' into dmaengine
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
i8253.c
diff --git
a/arch/x86/kernel/i8253.c
b/arch/x86/kernel/i8253.c
index
c2e0bb0
..
5cf36c0
100644
(file)
--- a/
arch/x86/kernel/i8253.c
+++ b/
arch/x86/kernel/i8253.c
@@
-7,6
+7,7
@@
#include <linux/spinlock.h>
#include <linux/jiffies.h>
#include <linux/module.h>
+#include <linux/timex.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/io.h>