summaryrefslogtreecommitdiffstats
path: root/drivers/pci/dmar.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 08:14:45 +0200
committerLen Brown <len.brown@intel.com>2009-09-19 08:14:45 +0200
commitd26f0528d588e596955bf296a609afe52eafc099 (patch)
tree314f7a5637d5517a19f29d64a17e3459505def8f /drivers/pci/dmar.c
parentMerge branch 'thinkpad' into release (diff)
parentthermal: add missing Kconfig dependency (diff)
downloadlinux-d26f0528d588e596955bf296a609afe52eafc099.tar.xz
linux-d26f0528d588e596955bf296a609afe52eafc099.zip
Merge branch 'misc-2.6.32' into release
Conflicts: drivers/pci/dmar.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci/dmar.c')
-rw-r--r--drivers/pci/dmar.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 47aa5938fb04..5f6b915d0d82 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -34,6 +34,7 @@
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/tboot.h>
+#include <linux/dmi.h>
#define PREFIX "DMAR: "