diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
| commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
| tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /drivers/acpi/pci_root.c | |
| parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 31b961c2f22f..31122214e0ec 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
| @@ -36,6 +36,8 @@ | |||
| 36 | #include <acpi/acpi_bus.h> | 36 | #include <acpi/acpi_bus.h> |
| 37 | #include <acpi/acpi_drivers.h> | 37 | #include <acpi/acpi_drivers.h> |
| 38 | 38 | ||
| 39 | #define PREFIX "ACPI: " | ||
| 40 | |||
| 39 | #define _COMPONENT ACPI_PCI_COMPONENT | 41 | #define _COMPONENT ACPI_PCI_COMPONENT |
| 40 | ACPI_MODULE_NAME("pci_root"); | 42 | ACPI_MODULE_NAME("pci_root"); |
| 41 | #define ACPI_PCI_ROOT_CLASS "pci_bridge" | 43 | #define ACPI_PCI_ROOT_CLASS "pci_bridge" |