Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / asm-x86_64 / calgary.h

diff --git a/include/asm-x86_64/calgary.h b/include/asm-x86_64/calgary.h
index 7ee90064571955ca938b43b6b1c77364037c0978..4d5747a0923c7d973e0c476ad1729eae82bc72ff 100644 (file)
--- a/include/asm-x86_64/calgary.h
+++ b/include/asm-x86_64/calgary.h
@@ -27,6 +27,7 @@
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/timer.h>
 #include <asm/types.h>
 
 struct iommu_table {