Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ccad66f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-cleanup' into acpi-hotplug 

Conflicts:
	drivers/acpi/scan.c
parents 8ff47aaf 8b48463f

arch/ia64/hp/common/aml_nfw.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ 
 */

 */





#include <linux/module.h>

#include <linux/module.h>

#include <acpi/acpi_bus.h>

#include <linux/acpi.h>

#include <acpi/acpi_drivers.h>

#include <asm/sal.h>

#include <asm/sal.h>





MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");

MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");

arch/x86/kernel/apic/apic_flat_64.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -21,9 +21,7 @@ 
#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/ipi.h>

#include <asm/ipi.h>





#ifdef CONFIG_ACPI

#include <linux/acpi.h>

#include <acpi/acpi_bus.h>

#endif





static struct apic apic_physflat;

static struct apic apic_physflat;

static struct apic apic_flat;

static struct apic apic_flat;

arch/x86/kernel/apic/io_apic.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -37,9 +37,6 @@ 
#include <linux/kthread.h>

#include <linux/kthread.h>

#include <linux/jiffies.h>	/* time_after() */

#include <linux/jiffies.h>	/* time_after() */

#include <linux/slab.h>

#include <linux/slab.h>

#ifdef CONFIG_ACPI

#include <acpi/acpi_bus.h>

#endif

#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/dmar.h>

#include <linux/dmar.h>

#include <linux/hpet.h>

#include <linux/hpet.h>

arch/x86/pci/mmconfig_32.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/rcupdate.h>

#include <linux/rcupdate.h>

#include <asm/e820.h>

#include <asm/e820.h>

#include <asm/pci_x86.h>

#include <asm/pci_x86.h>

#include <acpi/acpi.h>





/* Assume systems with more busses have correct MCFG */

/* Assume systems with more busses have correct MCFG */

#define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))

#define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))

arch/x86/platform/olpc/olpc-xo15-sci.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,7 @@ 
#include <linux/power_supply.h>

#include <linux/power_supply.h>

#include <linux/olpc-ec.h>

#include <linux/olpc-ec.h>





#include <acpi/acpi_bus.h>

#include <linux/acpi.h>

#include <acpi/acpi_drivers.h>

#include <asm/olpc.h>

#include <asm/olpc.h>





#define DRV_NAME			"olpc-xo15-sci"

#define DRV_NAME			"olpc-xo15-sci"