OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: Clean up inclusions of ACPI header files 

Replace direct inclusions of <acpi/acpi.h>, <acpi/acpi_bus.h> and
<acpi/acpi_drivers.h>, which are incorrect, with <linux/acpi.h>
inclusions and remove some inclusions of those files that aren't
necessary.

First of all, <acpi/acpi.h>, <acpi/acpi_bus.h> and <acpi/acpi_drivers.h>
should not be included directly from any files that are built for
CONFIG_ACPI unset, because that generally leads to build warnings about
undefined symbols in !CONFIG_ACPI builds.  For CONFIG_ACPI set,
<linux/acpi.h> includes those files and for CONFIG_ACPI unset it
provides stub ACPI symbols to be used in that case.

Second, there are ordering dependencies between those files that always
have to be met.  Namely, it is required that <acpi/acpi_bus.h> be included
prior to <acpi/acpi_drivers.h> so that the acpi_pci_root declarations the
latter depends on are always there.  And <acpi/acpi.h> which provides
basic ACPICA type declarations should always be included prior to any other
ACPI headers in CONFIG_ACPI builds.  That also is taken care of including
<linux/acpi.h> as appropriate.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com> (drivers/pci stuff)
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> (Xen stuff)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2013-12-03 08:49:16 +08:00 committed by Rafael J. Wysocki
parent 6ce4eac1f6
commit 8b48463f89
103 changed files with 80 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/ia64/hp/common/aml_nfw.c
View File

@ -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>");

4
arch/x86/kernel/apic/apic_flat_64.c
View File

@ -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;

3
arch/x86/kernel/apic/io_apic.c
View File

@ -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>

1
arch/x86/pci/mmconfig_32.c
View File

@ -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))

3
arch/x86/platform/olpc/olpc-xo15-sci.c
View File

@ -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"

3
drivers/acpi/ac.c
View File

@ -32,8 +32,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

1
drivers/acpi/acpi_extlog.c
View File

@ -9,7 +9,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/cper.h> #include <linux/cper.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <asm/cpu.h> #include <asm/cpu.h>

3
drivers/acpi/acpi_pad.c
View File

@ -28,8 +28,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <asm/mwait.h> #include <asm/mwait.h>
#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"

1
drivers/acpi/apei/einj.c
View File

@ -33,7 +33,6 @@
#include <linux/nmi.h> #include <linux/nmi.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <acpi/acpi.h>
#include "apei-internal.h" #include "apei-internal.h"

3
drivers/acpi/battery.c
View File

@ -36,8 +36,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

1
drivers/acpi/blacklist.c
View File

@ -30,7 +30,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include "internal.h" #include "internal.h"

2
drivers/acpi/bus.c
View File

@ -37,8 +37,6 @@
#include <asm/mpspec.h> #include <asm/mpspec.h>
#endif #endif
#include <linux/pci.h> #include <linux/pci.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/apei.h> #include <acpi/apei.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/suspend.h> #include <linux/suspend.h>

3
drivers/acpi/button.c
View File

@ -31,8 +31,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <acpi/button.h> #include <acpi/button.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

2
drivers/acpi/custom_method.c
View File

@ -7,7 +7,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include "internal.h" #include "internal.h"

2
drivers/acpi/debugfs.c
View File

@ -5,7 +5,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#define _COMPONENT ACPI_SYSTEM_COMPONENT #define _COMPONENT ACPI_SYSTEM_COMPONENT
ACPI_MODULE_NAME("debugfs"); ACPI_MODULE_NAME("debugfs");

2
drivers/acpi/dock.c
View File

@ -32,8 +32,6 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

5
drivers/acpi/ec.c
View File

@ -39,10 +39,9 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/io.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <asm/io.h>
#include "internal.h" #include "internal.h"

2
drivers/acpi/event.c
View File

@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/genetlink.h> #include <net/genetlink.h>

3
drivers/acpi/fan.c
View File

@ -29,8 +29,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/thermal.h> #include <linux/thermal.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

2
drivers/acpi/hed.c
View File

@ -25,8 +25,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/hed.h> #include <acpi/hed.h>
static struct acpi_device_id acpi_hed_ids[] = { static struct acpi_device_id acpi_hed_ids[] = {

1
drivers/acpi/numa.c
View File

@ -29,7 +29,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/numa.h> #include <linux/numa.h>
#include <acpi/acpi_bus.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

3
drivers/acpi/osl.c
View File

@ -49,9 +49,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/processor.h>
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_OS_SERVICES #define _COMPONENT ACPI_OS_SERVICES

2
drivers/acpi/pci_irq.c
View File

@ -37,8 +37,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

4
drivers/acpi/pci_link.c
View File

@ -39,9 +39,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

4
drivers/acpi/pci_root.c
View File

@ -35,9 +35,7 @@
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_bus.h> #include <acpi/apei.h> /* for acpi_hest_init() */
#include <acpi/acpi_drivers.h>
#include <acpi/apei.h>
#include "internal.h" #include "internal.h"

3
drivers/acpi/power.c
View File

@ -42,8 +42,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include "sleep.h" #include "sleep.h"
#include "internal.h" #include "internal.h"

4
drivers/acpi/proc.c
View File

@ -3,11 +3,9 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/bcd.h> #include <linux/bcd.h>
#include <linux/acpi.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include "sleep.h" #include "sleep.h"
#define _COMPONENT ACPI_SYSTEM_COMPONENT #define _COMPONENT ACPI_SYSTEM_COMPONENT

3
drivers/acpi/processor_core.c
View File

@ -10,8 +10,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <acpi/processor.h> #include <acpi/processor.h>
#include "internal.h" #include "internal.h"

4
drivers/acpi/processor_idle.c
View File

@ -35,6 +35,7 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/cpuidle.h> #include <linux/cpuidle.h>
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <acpi/processor.h>
/* /*
* Include the apic definitions for x86 to have the APIC timer related defines * Include the apic definitions for x86 to have the APIC timer related defines
@ -46,9 +47,6 @@
#include <asm/apic.h> #include <asm/apic.h>
#endif #endif
#include <acpi/acpi_bus.h>
#include <acpi/processor.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"

7
drivers/acpi/processor_perflib.c
View File

@ -31,15 +31,12 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/acpi.h>
#include <acpi/processor.h>
#ifdef CONFIG_X86 #ifdef CONFIG_X86
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
#endif #endif
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/processor.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"

7
drivers/acpi/processor_thermal.c
View File

@ -30,12 +30,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/acpi.h>
#include <asm/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/processor.h> #include <acpi/processor.h>
#include <acpi/acpi_drivers.h> #include <asm/uaccess.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

7
drivers/acpi/processor_throttling.c
View File

@ -32,14 +32,11 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/acpi.h>
#include <acpi/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/processor.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
#define ACPI_PROCESSOR_CLASS "processor" #define ACPI_PROCESSOR_CLASS "processor"

3
drivers/acpi/sbshc.c
View File

@ -8,8 +8,7 @@
* the Free Software Foundation version 2. * the Free Software Foundation version 2.
*/ */
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>

2
drivers/acpi/scan.c
View File

@ -12,8 +12,6 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/nls.h> #include <linux/nls.h>
#include <acpi/acpi_drivers.h>
#include "internal.h" #include "internal.h"
#define _COMPONENT ACPI_BUS_COMPONENT #define _COMPONENT ACPI_BUS_COMPONENT

4
drivers/acpi/sleep.c
View File

@ -18,12 +18,8 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include "internal.h" #include "internal.h"
#include "sleep.h" #include "sleep.h"

2
drivers/acpi/sysfs.c
View File

@ -5,7 +5,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include "internal.h" #include "internal.h"

5
drivers/acpi/thermal.c
View File

@ -41,10 +41,9 @@
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/device.h> #include <linux/device.h>
#include <asm/uaccess.h>
#include <linux/thermal.h> #include <linux/thermal.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h> #include <asm/uaccess.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "

2
drivers/acpi/utils.c
View File

@ -30,8 +30,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include "internal.h" #include "internal.h"

5
drivers/acpi/video.c
View File

@ -37,12 +37,11 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/uaccess.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/acpi.h>
#include <acpi/video.h> #include <acpi/video.h>
#include <asm/uaccess.h>
#include "internal.h" #include "internal.h"

1
drivers/acpi/wakeup.c
View File

@ -5,7 +5,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>

2
drivers/ata/libata-acpi.c
View File

@ -20,8 +20,6 @@
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
#include "libata.h" #include "libata.h"
#include <acpi/acpi_bus.h>
unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644); module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);
MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)"); MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");

5
drivers/ata/pata_acpi.c
View File

@ -12,11 +12,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <scsi/scsi_host.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/libata.h> #include <linux/libata.h>
#include <linux/ata.h> #include <linux/ata.h>
#include <scsi/scsi_host.h>
#define DRV_NAME "pata_acpi" #define DRV_NAME "pata_acpi"
#define DRV_VERSION "0.2.3" #define DRV_VERSION "0.2.3"

7
drivers/char/hpet.c
View File

@ -34,15 +34,12 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/acpi.h>
#include <linux/hpet.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/hpet.h>
/* /*
* The High Precision Event Timer driver. * The High Precision Event Timer driver.
* This driver is closely modelled after the rtc.c driver. * This driver is closely modelled after the rtc.c driver.

2
drivers/char/tpm/tpm_acpi.c
View File

@ -23,7 +23,7 @@
#include <linux/security.h> #include <linux/security.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi.h> #include <linux/acpi.h>
#include "tpm.h" #include "tpm.h"
#include "tpm_eventlog.h" #include "tpm_eventlog.h"

1
drivers/char/tpm/tpm_ppi.c
View File

@ -1,5 +1,4 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include "tpm.h" #include "tpm.h"
static const u8 tpm_ppi_uuid[] = { static const u8 tpm_ppi_uuid[] = {

2
drivers/gpu/drm/i915/intel_acpi.c
View File

@ -6,8 +6,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/vga_switcheroo.h> #include <linux/vga_switcheroo.h>
#include <acpi/acpi_drivers.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include "i915_drv.h" #include "i915_drv.h"

7
drivers/gpu/drm/nouveau/nouveau_acpi.c
View File

@ -1,15 +1,10 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
#include <acpi/video.h>
#include <acpi/acpi.h>
#include <linux/mxm-wmi.h> #include <linux/mxm-wmi.h>
#include <linux/vga_switcheroo.h> #include <linux/vga_switcheroo.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <acpi/video.h>
#include "nouveau_drm.h" #include "nouveau_drm.h"
#include "nouveau_acpi.h" #include "nouveau_acpi.h"

6
drivers/gpu/drm/radeon/radeon_acpi.c
View File

@ -25,18 +25,14 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <acpi/acpi_drivers.h> #include <linux/vga_switcheroo.h>
#include <acpi/acpi_bus.h>
#include <acpi/video.h> #include <acpi/video.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include "radeon.h" #include "radeon.h"
#include "radeon_acpi.h" #include "radeon_acpi.h"
#include "atom.h" #include "atom.h"
#include <linux/vga_switcheroo.h>
#define ACPI_AC_CLASS "ac_adapter" #define ACPI_AC_CLASS "ac_adapter"
extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev);

2
drivers/hv/vmbus_drv.c
View File

@ -30,7 +30,6 @@
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/hyperv.h> #include <linux/hyperv.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
@ -39,7 +38,6 @@
#include <asm/mshyperv.h> #include <asm/mshyperv.h>
#include "hyperv_vmbus.h" #include "hyperv_vmbus.h"
static struct acpi_device *hv_acpi_dev; static struct acpi_device *hv_acpi_dev;
static struct tasklet_struct msg_dpc; static struct tasklet_struct msg_dpc;

3
drivers/hwmon/acpi_power_meter.c
View File

@ -30,8 +30,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/err.h> #include <linux/err.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#define ACPI_POWER_METER_NAME "power_meter" #define ACPI_POWER_METER_NAME "power_meter"
ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);

7
drivers/hwmon/asus_atk0110.c
View File

@ -16,12 +16,7 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/acpi.h>
#include <acpi/acpi.h>
#include <acpi/acpixf.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
#define ATK_HID "ATK0110" #define ATK_HID "ATK0110"

1
drivers/ide/ide-acpi.c
View File

@ -14,7 +14,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi.h>
#include <linux/ide.h> #include <linux/ide.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/dmi.h> #include <linux/dmi.h>

2
drivers/input/misc/atlas_btns.c
View File

@ -28,8 +28,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/acpi.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <acpi/acpi_drivers.h>
#define ACPI_ATLAS_NAME "Atlas ACPI" #define ACPI_ATLAS_NAME "Atlas ACPI"
#define ACPI_ATLAS_CLASS "Atlas" #define ACPI_ATLAS_CLASS "Atlas"

1
drivers/iommu/amd_iommu_init.c
View File

@ -26,7 +26,6 @@
#include <linux/msi.h> #include <linux/msi.h>
#include <linux/amd-iommu.h> #include <linux/amd-iommu.h>
#include <linux/export.h> #include <linux/export.h>
#include <acpi/acpi.h>
#include <asm/pci-direct.h> #include <asm/pci-direct.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/gart.h> #include <asm/gart.h>

4
drivers/iommu/intel_irq_remapping.c
View File

@ -6,11 +6,11 @@
#include <linux/hpet.h> #include <linux/hpet.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/intel-iommu.h>
#include <linux/acpi.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <linux/intel-iommu.h>
#include <acpi/acpi.h>
#include <asm/irq_remapping.h> #include <asm/irq_remapping.h>
#include <asm/pci-direct.h> #include <asm/pci-direct.h>
#include <asm/msidef.h> #include <asm/msidef.h>

3
drivers/pci/hotplug/acpiphp_ibm.c
View File

@ -31,12 +31,11 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <acpi/acpi_bus.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <asm/uaccess.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/uaccess.h>
#include "acpiphp.h" #include "acpiphp.h"
#include "../pci.h" #include "../pci.h"

2
drivers/pci/hotplug/pciehp.h
View File

@ -163,8 +163,6 @@ static inline const char *slot_name(struct slot *slot)
} }
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/pci-acpi.h> #include <linux/pci-acpi.h>
void __init pciehp_acpi_slot_detection_init(void); void __init pciehp_acpi_slot_detection_init(void);

1
drivers/pci/ioapic.c
View File

@ -20,7 +20,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_bus.h>
struct ioapic { struct ioapic {
acpi_handle handle; acpi_handle handle;

3
drivers/pci/pci-acpi.c
View File

@ -12,9 +12,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/pci-acpi.h> #include <linux/pci-acpi.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/pm_qos.h> #include <linux/pm_qos.h>

1
drivers/pci/pci-label.c
View File

@ -29,7 +29,6 @@
#include <linux/nls.h> #include <linux/nls.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/pci-acpi.h> #include <linux/pci-acpi.h>
#include <acpi/acpi_bus.h>
#include "pci.h" #include "pci.h"
#define DEVICE_LABEL_DSM 0x07 #define DEVICE_LABEL_DSM 0x07

2
drivers/platform/x86/acer-wmi.c
View File

@ -41,8 +41,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#include <acpi/acpi_drivers.h>
#include <acpi/video.h> #include <acpi/video.h>
MODULE_AUTHOR("Carlos Corbacho"); MODULE_AUTHOR("Carlos Corbacho");

3
drivers/platform/x86/asus-laptop.c
View File

@ -53,8 +53,7 @@
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#define ASUS_LAPTOP_VERSION "0.42" #define ASUS_LAPTOP_VERSION "0.42"

3
drivers/platform/x86/asus-wmi.c
View File

@ -45,8 +45,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/thermal.h> #include <linux/thermal.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <acpi/video.h> #include <acpi/video.h>
#include "asus-wmi.h" #include "asus-wmi.h"

3
drivers/platform/x86/classmate-laptop.c
View File

@ -21,14 +21,13 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
struct cmpc_accel { struct cmpc_accel {
int sensitivity; int sensitivity;
int g_select; int g_select;

1
drivers/platform/x86/dell-wmi-aio.c
View File

@ -24,7 +24,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#include <acpi/acpi_drivers.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/string.h> #include <linux/string.h>

1
drivers/platform/x86/dell-wmi.c
View File

@ -32,7 +32,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#include <acpi/acpi_drivers.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/dmi.h> #include <linux/dmi.h>

3
drivers/platform/x86/eeepc-laptop.c
View File

@ -28,8 +28,7 @@
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h> #include <linux/hwmon-sysfs.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>

2
drivers/platform/x86/eeepc-wmi.c
View File

@ -33,7 +33,7 @@
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include "asus-wmi.h" #include "asus-wmi.h"

2
drivers/platform/x86/hp_accel.c
View File

@ -36,7 +36,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include "../../misc/lis3lv02d/lis3lv02d.h" #include "../../misc/lis3lv02d/lis3lv02d.h"
#define DRIVER_NAME "hp_accel" #define DRIVER_NAME "hp_accel"

3
drivers/platform/x86/ideapad-laptop.c
View File

@ -26,8 +26,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/input.h> #include <linux/input.h>

2
drivers/platform/x86/intel-rst.c
View File

@ -20,7 +20,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/platform/x86/intel-smartconnect.c
View File

@ -19,7 +19,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/platform/x86/intel_menlow.c
View File

@ -36,10 +36,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/thermal.h> #include <linux/thermal.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
MODULE_AUTHOR("Thomas Sujith"); MODULE_AUTHOR("Thomas Sujith");
MODULE_AUTHOR("Zhang Rui"); MODULE_AUTHOR("Zhang Rui");

3
drivers/platform/x86/intel_oaktrail.c
View File

@ -50,9 +50,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#define DRIVER_NAME "intel_oaktrail" #define DRIVER_NAME "intel_oaktrail"
#define DRIVER_VERSION "0.4ac1" #define DRIVER_VERSION "0.4ac1"

3
drivers/platform/x86/mxm-wmi.c
View File

@ -20,8 +20,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
MODULE_AUTHOR("Dave Airlie"); MODULE_AUTHOR("Dave Airlie");
MODULE_DESCRIPTION("MXM WMI Driver"); MODULE_DESCRIPTION("MXM WMI Driver");

4
drivers/platform/x86/panasonic-laptop.c
View File

@ -125,12 +125,10 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/input/sparse-keymap.h> #include <linux/input/sparse-keymap.h>
#ifndef ACPI_HOTKEY_COMPONENT #ifndef ACPI_HOTKEY_COMPONENT
#define ACPI_HOTKEY_COMPONENT 0x10000000 #define ACPI_HOTKEY_COMPONENT 0x10000000
#endif #endif

3
drivers/platform/x86/pvpanic.c
View File

@ -24,8 +24,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>"); MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>");
MODULE_DESCRIPTION("pvpanic device driver"); MODULE_DESCRIPTION("pvpanic device driver");

2
drivers/platform/x86/samsung-q10.c
View File

@ -15,7 +15,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#define SAMSUNGQ10_BL_MAX_INTENSITY 7 #define SAMSUNGQ10_BL_MAX_INTENSITY 7

4
drivers/platform/x86/sony-laptop.c
View File

@ -61,9 +61,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
#include <asm/uaccess.h>
#include <linux/sonypi.h> #include <linux/sonypi.h>
#include <linux/sony-laptop.h> #include <linux/sony-laptop.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
@ -71,6 +68,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#endif #endif
#include <asm/uaccess.h>
#define dprintk(fmt, ...) \ #define dprintk(fmt, ...) \
do { \ do { \

4
drivers/platform/x86/tc1100-wmi.c
View File

@ -32,9 +32,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#define GUID "C364AC71-36DB-495A-8494-B439D472A505" #define GUID "C364AC71-36DB-495A-8494-B439D472A505"

14
drivers/platform/x86/thinkpad_acpi.c
View File

@ -61,7 +61,6 @@
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/nvram.h> #include <linux/nvram.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
@ -74,21 +73,16 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <asm/uaccess.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/acpi.h>
#include <linux/pci_ids.h>
#include <linux/thinkpad_acpi.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/control.h> #include <sound/control.h>
#include <sound/initval.h> #include <sound/initval.h>
#include <asm/uaccess.h>
#include <acpi/acpi_drivers.h>
#include <linux/pci_ids.h>
#include <linux/thinkpad_acpi.h>
/* ThinkPad CMOS commands */ /* ThinkPad CMOS commands */
#define TP_CMOS_VOLUME_DOWN 0 #define TP_CMOS_VOLUME_DOWN 0

4
drivers/platform/x86/toshiba_acpi.c
View File

@ -54,11 +54,9 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/i8042.h> #include <linux/i8042.h>
#include <linux/acpi.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <acpi/acpi_drivers.h>
MODULE_AUTHOR("John Belmonte"); MODULE_AUTHOR("John Belmonte");
MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver"); MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/platform/x86/toshiba_bluetooth.c
View File

@ -23,14 +23,12 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@gmail.com>"); MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@gmail.com>");
MODULE_DESCRIPTION("Toshiba Laptop ACPI Bluetooth Enable Driver"); MODULE_DESCRIPTION("Toshiba Laptop ACPI Bluetooth Enable Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int toshiba_bt_rfkill_add(struct acpi_device *device); static int toshiba_bt_rfkill_add(struct acpi_device *device);
static int toshiba_bt_rfkill_remove(struct acpi_device *device); static int toshiba_bt_rfkill_remove(struct acpi_device *device);
static void toshiba_bt_rfkill_notify(struct acpi_device *device, u32 event); static void toshiba_bt_rfkill_notify(struct acpi_device *device, u32 event);

2
drivers/platform/x86/wmi.c
View File

@ -37,8 +37,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
ACPI_MODULE_NAME("wmi"); ACPI_MODULE_NAME("wmi");
MODULE_AUTHOR("Carlos Corbacho"); MODULE_AUTHOR("Carlos Corbacho");

3
drivers/platform/x86/xo15-ebook.c
View File

@ -18,8 +18,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/input.h> #include <linux/input.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#define MODULE_NAME "xo15-ebook" #define MODULE_NAME "xo15-ebook"

1
drivers/pnp/pnpacpi/core.c
View File

@ -24,7 +24,6 @@
#include <linux/pnp.h> #include <linux/pnp.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <acpi/acpi_bus.h>
#include "../base.h" #include "../base.h"
#include "pnpacpi.h" #include "pnpacpi.h"

1
drivers/pnp/pnpacpi/pnpacpi.h
View File

@ -1,7 +1,6 @@
#ifndef ACPI_PNP_H #ifndef ACPI_PNP_H
#define ACPI_PNP_H #define ACPI_PNP_H
#include <acpi/acpi_bus.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/pnp.h> #include <linux/pnp.h>

2
drivers/sfi/sfi_acpi.c
View File

@ -60,7 +60,7 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <acpi/acpi.h> #include <acpi/acpi.h> /* FIXME: inclusion should be removed */
#include <linux/sfi.h> #include <linux/sfi.h>
#include "sfi_core.h" #include "sfi_core.h"

2
drivers/staging/quickstart/quickstart.c
View File

@ -31,7 +31,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi_drivers.h> #include <linux/acpi.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/input.h> #include <linux/input.h>

1
drivers/usb/core/usb-acpi.c
View File

@ -16,7 +16,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
#include <acpi/acpi_bus.h>
#include "usb.h" #include "usb.h"

3
drivers/xen/xen-acpi-cpuhotplug.c
View File

@ -24,10 +24,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/processor.h> #include <acpi/processor.h>
#include <xen/acpi.h> #include <xen/acpi.h>
#include <xen/interface/platform.h> #include <xen/interface/platform.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>

1
drivers/xen/xen-acpi-memhotplug.c
View File

@ -22,7 +22,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <xen/acpi.h> #include <xen/acpi.h>
#include <xen/interface/platform.h> #include <xen/interface/platform.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>

5
drivers/xen/xen-acpi-pad.c
View File

@ -18,11 +18,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <asm/xen/hypercall.h>
#include <xen/interface/version.h> #include <xen/interface/version.h>
#include <xen/xen-ops.h> #include <xen/xen-ops.h>
#include <asm/xen/hypercall.h>
#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
#define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"

4
drivers/xen/xen-acpi-processor.c
View File

@ -28,10 +28,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <acpi/acpi_bus.h> #include <linux/acpi.h>
#include <acpi/acpi_drivers.h>
#include <acpi/processor.h> #include <acpi/processor.h>
#include <xen/xen.h> #include <xen/xen.h>
#include <xen/interface/platform.h> #include <xen/interface/platform.h>
#include <asm/xen/hypercall.h> #include <asm/xen/hypercall.h>

2
include/acpi/acpi_bus.h
View File

@ -28,8 +28,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <acpi/acpi.h>
/* TBD: Make dynamic */ /* TBD: Make dynamic */
#define ACPI_MAX_HANDLES 10 #define ACPI_MAX_HANDLES 10
struct acpi_handle_list { struct acpi_handle_list {

3
include/acpi/acpi_drivers.h
View File

@ -26,9 +26,6 @@
#ifndef __ACPI_DRIVERS_H__ #ifndef __ACPI_DRIVERS_H__
#define __ACPI_DRIVERS_H__ #define __ACPI_DRIVERS_H__
#include <linux/acpi.h>
#include <acpi/acpi_bus.h>
#define ACPI_MAX_STRING 80 #define ACPI_MAX_STRING 80
/* /*

2
include/linux/acpi_io.h
View File

@ -2,7 +2,7 @@
#define _ACPI_IO_H_ #define _ACPI_IO_H_
#include <linux/io.h> #include <linux/io.h>
#include <acpi/acpi.h> #include <acpi/acpi.h> /* FIXME: inclusion should be removed */
static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
acpi_size size) acpi_size size)

8
include/linux/ide.h
View File

@ -18,14 +18,10 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#ifdef CONFIG_BLK_DEV_IDEACPI
#include <acpi/acpi.h>
#endif
#include <asm/byteorder.h>
#include <asm/io.h>
/* for request_sense */ /* for request_sense */
#include <linux/cdrom.h> #include <linux/cdrom.h>
#include <asm/byteorder.h>
#include <asm/io.h>
#if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300)
# define SUPPORT_VLB_SYNC 0 # define SUPPORT_VLB_SYNC 0

2
include/linux/iscsi_ibft.h
View File

@ -21,7 +21,7 @@
#ifndef ISCSI_IBFT_H #ifndef ISCSI_IBFT_H
#define ISCSI_IBFT_H #define ISCSI_IBFT_H
#include <acpi/acpi.h> #include <acpi/acpi.h> /* FIXME: inclusion should be removed */
/* /*
* Logical location of iSCSI Boot Format Table. * Logical location of iSCSI Boot Format Table.

3
include/linux/pci_hotplug.h
View File

@ -175,8 +175,7 @@ struct hotplug_params {
}; };
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
#include <acpi/acpi.h> #include <linux/acpi.h>
#include <acpi/acpi_bus.h>
int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);
int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);

Some files were not shown because too many files have changed in this diff Show More