diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-01 18:46:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-01 18:46:35 -0500 |
| commit | 7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3 (patch) | |
| tree | cf6d526a070a06b365ab0ceb4e1c3ca9ad94666e /drivers/pci/dmar.c | |
| parent | 138f3c8518976953563a1316d7e0420c72d4ab96 (diff) | |
| parent | 2127816366e0ffbc1426fa69e7b9b2bebd2e2288 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/pci/dmar.c')
| -rw-r--r-- | drivers/pci/dmar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index e5f8fc164fd3..b952ebc7a78b 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c | |||
| @@ -609,6 +609,9 @@ int __init check_zero_address(void) | |||
| 609 | dmi_get_system_info(DMI_BIOS_VENDOR), | 609 | dmi_get_system_info(DMI_BIOS_VENDOR), |
| 610 | dmi_get_system_info(DMI_BIOS_VERSION), | 610 | dmi_get_system_info(DMI_BIOS_VERSION), |
| 611 | dmi_get_system_info(DMI_PRODUCT_VERSION)); | 611 | dmi_get_system_info(DMI_PRODUCT_VERSION)); |
| 612 | #ifdef CONFIG_DMAR | ||
| 613 | dmar_disabled = 1; | ||
| 614 | #endif | ||
| 612 | return 0; | 615 | return 0; |
| 613 | } | 616 | } |
| 614 | break; | 617 | break; |