diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 10:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 10:48:31 +0100 |
| commit | c032a2de4c1a82187e9a754511043be47c8a92b5 (patch) | |
| tree | 6d20bfcff683555b641a376ffdffb2dbc1f1599a /drivers/acpi/pci_root.c | |
| parent | 722024dbb74f3ea316c285c0a71a4512e113b0c4 (diff) | |
| parent | cbe9ee00cea58d1f77b172fe22a51080e90877f2 (diff) | |
Merge branch 'x86/cleanups' into x86/irq
[ merged x86/cleanups into x86/irq to enable a wider IRQ entry code
patch to be applied, which depends on a cleanup patch in x86/cleanups. ]
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 1b8f67d21d5..642554b1b60 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -376,15 +376,9 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type) static int __init acpi_pci_root_init(void) { - if (acpi_pci_disabled) return 0; - /* DEBUG: - acpi_dbg_layer = ACPI_PCI_COMPONENT; - acpi_dbg_level = 0xFFFFFFFF; - */ - if (acpi_bus_register_driver(&acpi_pci_root_driver) < 0) return -ENODEV; |