aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 02:14:45 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 02:14:45 -0400
commitd26f0528d588e596955bf296a609afe52eafc099 (patch)
tree314f7a5637d5517a19f29d64a17e3459505def8f /drivers/pci
parentb963bd39c9000328f6ce4f12aa52abbb0c68ee91 (diff)
parentdf43176c934f2bc01f7615a6e20a4b8e77dcdd11 (diff)
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')
-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 47aa5938fb0..5f6b915d0d8 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: "