diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:37:13 -0400 |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/pci/dmar.c | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci/dmar.c')
| -rw-r--r-- | drivers/pci/dmar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index ab99783dccec..47aa5938fb04 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c | |||
| @@ -35,8 +35,7 @@ | |||
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/tboot.h> | 36 | #include <linux/tboot.h> |
| 37 | 37 | ||
| 38 | #undef PREFIX | 38 | #define PREFIX "DMAR: " |
| 39 | #define PREFIX "DMAR:" | ||
| 40 | 39 | ||
| 41 | /* No locks are needed as DMA remapping hardware unit | 40 | /* No locks are needed as DMA remapping hardware unit |
| 42 | * list is constructed at boot time and hotplug of | 41 | * list is constructed at boot time and hotplug of |