aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/dmar.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 00:37:13 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 00:37:13 -0400
commit003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch)
treec9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/pci/dmar.c
parent71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff)
parente55a5999ffcf72dc4d43d73618957964cb87065a (diff)
downloadkernel_samsung_smdk4412-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.zip
kernel_samsung_smdk4412-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.gz
kernel_samsung_smdk4412-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.bz2
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index ab99783..47aa593 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -35,8 +35,7 @@
#include <linux/interrupt.h>
#include <linux/tboot.h>
-#undef PREFIX
-#define PREFIX "DMAR:"
+#define PREFIX "DMAR: "
/* No locks are needed as DMA remapping hardware unit
* list is constructed at boot time and hotplug of