diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-06-15 14:43:52 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-07-11 13:19:32 -0400 |
| commit | 34b1d1269d9fdaa1558e3014c3cc03ac0967de95 (patch) | |
| tree | 57d5b41e8de7504b978ba2e1f45f4ab7faf1245a /arch/x86/pci | |
| parent | 9b6519db5e226c0c83acddf788b7091b751fbb75 (diff) | |
| download | op-kernel-dev-34b1d1269d9fdaa1558e3014c3cc03ac0967de95.zip op-kernel-dev-34b1d1269d9fdaa1558e3014c3cc03ac0967de95.tar.gz | |
xen/pci: Retire unnecessary #ifdef CONFIG_ACPI
As the code paths that are guarded by CONFIG_XEN_DOM0 already depend
on CONFIG_ACPI so the extra #ifdef is not required. The earlier
patch that added them in had done its job.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/xen.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index e585bf5..6eddc52 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -381,7 +381,6 @@ int __init pci_xen_hvm_init(void) } #ifdef CONFIG_XEN_DOM0 -#ifdef CONFIG_ACPI static __init void xen_setup_acpi_sci(void) { int rc; @@ -428,7 +427,6 @@ static __init void xen_setup_acpi_sci(void) return; } -#endif int __init pci_xen_initial_domain(void) { @@ -438,7 +436,6 @@ int __init pci_xen_initial_domain(void) x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; x86_msi.teardown_msi_irq = xen_teardown_msi_irq; #endif -#ifdef CONFIG_ACPI xen_setup_acpi_sci(); __acpi_register_gsi = acpi_register_gsi_xen; /* Pre-allocate legacy irqs */ @@ -452,7 +449,6 @@ int __init pci_xen_initial_domain(void) trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE, true /* allocate IRQ */); } -#endif if (0 == nr_ioapics) { for (irq = 0; irq < NR_IRQS_LEGACY; irq++) { pirq = xen_allocate_pirq_gsi(irq); |
