diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 02:14:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 02:14:45 -0400 |
| commit | d26f0528d588e596955bf296a609afe52eafc099 (patch) | |
| tree | 314f7a5637d5517a19f29d64a17e3459505def8f /drivers/pci/dmar.c | |
| parent | b963bd39c9000328f6ce4f12aa52abbb0c68ee91 (diff) | |
| parent | df43176c934f2bc01f7615a6e20a4b8e77dcdd11 (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/dmar.c')
| -rw-r--r-- | drivers/pci/dmar.c | 1 |
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 @@ | |||
| 34 | #include <linux/irq.h> | 34 | #include <linux/irq.h> |
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/tboot.h> | 36 | #include <linux/tboot.h> |
| 37 | #include <linux/dmi.h> | ||
| 37 | 38 | ||
| 38 | #define PREFIX "DMAR: " | 39 | #define PREFIX "DMAR: " |
| 39 | 40 | ||