tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts:
drivers/acpi/scan.c

Rafael J. Wysocki 9ccad66f 8ff47aaf

+80 -234
+1 -2
arch/ia64/hp/common/aml_nfw.c
··· 23 23 */ 24 24 25 25 #include <linux/module.h> 26 - #include <acpi/acpi_bus.h> 27 - #include <acpi/acpi_drivers.h> 26 + #include <linux/acpi.h> 28 27 #include <asm/sal.h> 29 28 30 29 MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>");
+1 -3
arch/x86/kernel/apic/apic_flat_64.c
··· 21 21 #include <asm/apic.h> 22 22 #include <asm/ipi.h> 23 23 24 - #ifdef CONFIG_ACPI 25 - #include <acpi/acpi_bus.h> 26 - #endif 24 + #include <linux/acpi.h> 27 25 28 26 static struct apic apic_physflat; 29 27 static struct apic apic_flat;
-3
arch/x86/kernel/apic/io_apic.c
··· 37 37 #include <linux/kthread.h> 38 38 #include <linux/jiffies.h> /* time_after() */ 39 39 #include <linux/slab.h> 40 - #ifdef CONFIG_ACPI 41 - #include <acpi/acpi_bus.h> 42 - #endif 43 40 #include <linux/bootmem.h> 44 41 #include <linux/dmar.h> 45 42 #include <linux/hpet.h>
-1
arch/x86/pci/mmconfig_32.c
··· 14 14 #include <linux/rcupdate.h> 15 15 #include <asm/e820.h> 16 16 #include <asm/pci_x86.h> 17 - #include <acpi/acpi.h> 18 17 19 18 /* Assume systems with more busses have correct MCFG */ 20 19 #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
+1 -2
arch/x86/platform/olpc/olpc-xo15-sci.c
··· 15 15 #include <linux/power_supply.h> 16 16 #include <linux/olpc-ec.h> 17 17 18 - #include <acpi/acpi_bus.h> 19 - #include <acpi/acpi_drivers.h> 18 + #include <linux/acpi.h> 20 19 #include <asm/olpc.h> 21 20 22 21 #define DRV_NAME "olpc-xo15-sci"
+1 -2
drivers/acpi/ac.c
··· 32 32 #include <linux/delay.h> 33 33 #include <linux/platform_device.h> 34 34 #include <linux/power_supply.h> 35 - #include <acpi/acpi_bus.h> 36 - #include <acpi/acpi_drivers.h> 35 + #include <linux/acpi.h> 37 36 38 37 #define PREFIX "ACPI: " 39 38
-1
drivers/acpi/acpi_extlog.c
··· 9 9 10 10 #include <linux/module.h> 11 11 #include <linux/acpi.h> 12 - #include <acpi/acpi_bus.h> 13 12 #include <linux/cper.h> 14 13 #include <linux/ratelimit.h> 15 14 #include <asm/cpu.h>
+1 -2
drivers/acpi/acpi_pad.c
··· 28 28 #include <linux/cpu.h> 29 29 #include <linux/clockchips.h> 30 30 #include <linux/slab.h> 31 - #include <acpi/acpi_bus.h> 32 - #include <acpi/acpi_drivers.h> 31 + #include <linux/acpi.h> 33 32 #include <asm/mwait.h> 34 33 35 34 #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
-1
drivers/acpi/apei/einj.c
··· 33 33 #include <linux/nmi.h> 34 34 #include <linux/delay.h> 35 35 #include <linux/mm.h> 36 - #include <acpi/acpi.h> 37 36 38 37 #include "apei-internal.h" 39 38
+1 -2
drivers/acpi/battery.c
··· 36 36 #include <linux/suspend.h> 37 37 #include <asm/unaligned.h> 38 38 39 - #include <acpi/acpi_bus.h> 40 - #include <acpi/acpi_drivers.h> 39 + #include <linux/acpi.h> 41 40 #include <linux/power_supply.h> 42 41 43 42 #define PREFIX "ACPI: "
-1
drivers/acpi/blacklist.c
··· 30 30 #include <linux/kernel.h> 31 31 #include <linux/init.h> 32 32 #include <linux/acpi.h> 33 - #include <acpi/acpi_bus.h> 34 33 #include <linux/dmi.h> 35 34 36 35 #include "internal.h"
-2
drivers/acpi/bus.c
··· 37 37 #include <asm/mpspec.h> 38 38 #endif 39 39 #include <linux/pci.h> 40 - #include <acpi/acpi_bus.h> 41 - #include <acpi/acpi_drivers.h> 42 40 #include <acpi/apei.h> 43 41 #include <linux/dmi.h> 44 42 #include <linux/suspend.h>
+1 -2
drivers/acpi/button.c
··· 31 31 #include <linux/seq_file.h> 32 32 #include <linux/input.h> 33 33 #include <linux/slab.h> 34 - #include <acpi/acpi_bus.h> 35 - #include <acpi/acpi_drivers.h> 34 + #include <linux/acpi.h> 36 35 #include <acpi/button.h> 37 36 38 37 #define PREFIX "ACPI: "
+1 -1
drivers/acpi/custom_method.c
··· 7 7 #include <linux/kernel.h> 8 8 #include <linux/uaccess.h> 9 9 #include <linux/debugfs.h> 10 - #include <acpi/acpi_drivers.h> 10 + #include <linux/acpi.h> 11 11 12 12 #include "internal.h" 13 13
+1 -1
drivers/acpi/debugfs.c
··· 5 5 #include <linux/export.h> 6 6 #include <linux/init.h> 7 7 #include <linux/debugfs.h> 8 - #include <acpi/acpi_drivers.h> 8 + #include <linux/acpi.h> 9 9 10 10 #define _COMPONENT ACPI_SYSTEM_COMPONENT 11 11 ACPI_MODULE_NAME("debugfs");
-2
drivers/acpi/dock.c
··· 32 32 #include <linux/jiffies.h> 33 33 #include <linux/stddef.h> 34 34 #include <linux/acpi.h> 35 - #include <acpi/acpi_bus.h> 36 - #include <acpi/acpi_drivers.h> 37 35 38 36 #define PREFIX "ACPI: " 39 37
+2 -3
drivers/acpi/ec.c
··· 39 39 #include <linux/list.h> 40 40 #include <linux/spinlock.h> 41 41 #include <linux/slab.h> 42 - #include <asm/io.h> 43 - #include <acpi/acpi_bus.h> 44 - #include <acpi/acpi_drivers.h> 42 + #include <linux/acpi.h> 45 43 #include <linux/dmi.h> 44 + #include <asm/io.h> 46 45 47 46 #include "internal.h" 48 47
+1 -1
drivers/acpi/event.c
··· 12 12 #include <linux/init.h> 13 13 #include <linux/poll.h> 14 14 #include <linux/gfp.h> 15 - #include <acpi/acpi_drivers.h> 15 + #include <linux/acpi.h> 16 16 #include <net/netlink.h> 17 17 #include <net/genetlink.h> 18 18
+1 -2
drivers/acpi/fan.c
··· 29 29 #include <linux/types.h> 30 30 #include <asm/uaccess.h> 31 31 #include <linux/thermal.h> 32 - #include <acpi/acpi_bus.h> 33 - #include <acpi/acpi_drivers.h> 32 + #include <linux/acpi.h> 34 33 35 34 #define PREFIX "ACPI: " 36 35
-2
drivers/acpi/hed.c
··· 25 25 #include <linux/module.h> 26 26 #include <linux/init.h> 27 27 #include <linux/acpi.h> 28 - #include <acpi/acpi_bus.h> 29 - #include <acpi/acpi_drivers.h> 30 28 #include <acpi/hed.h> 31 29 32 30 static struct acpi_device_id acpi_hed_ids[] = {
-1
drivers/acpi/numa.c
··· 29 29 #include <linux/errno.h> 30 30 #include <linux/acpi.h> 31 31 #include <linux/numa.h> 32 - #include <acpi/acpi_bus.h> 33 32 34 33 #define PREFIX "ACPI: " 35 34
-3
drivers/acpi/osl.c
··· 49 49 #include <asm/io.h> 50 50 #include <asm/uaccess.h> 51 51 52 - #include <acpi/acpi.h> 53 - #include <acpi/acpi_bus.h> 54 - #include <acpi/processor.h> 55 52 #include "internal.h" 56 53 57 54 #define _COMPONENT ACPI_OS_SERVICES
-2
drivers/acpi/pci_irq.c
··· 37 37 #include <linux/pci.h> 38 38 #include <linux/acpi.h> 39 39 #include <linux/slab.h> 40 - #include <acpi/acpi_bus.h> 41 - #include <acpi/acpi_drivers.h> 42 40 43 41 #define PREFIX "ACPI: " 44 42
+1 -3
drivers/acpi/pci_link.c
··· 39 39 #include <linux/pci.h> 40 40 #include <linux/mutex.h> 41 41 #include <linux/slab.h> 42 - 43 - #include <acpi/acpi_bus.h> 44 - #include <acpi/acpi_drivers.h> 42 + #include <linux/acpi.h> 45 43 46 44 #define PREFIX "ACPI: " 47 45
+1 -3
drivers/acpi/pci_root.c
··· 35 35 #include <linux/pci-aspm.h> 36 36 #include <linux/acpi.h> 37 37 #include <linux/slab.h> 38 - #include <acpi/acpi_bus.h> 39 - #include <acpi/acpi_drivers.h> 40 - #include <acpi/apei.h> 38 + #include <acpi/apei.h> /* for acpi_hest_init() */ 41 39 42 40 #include "internal.h" 43 41
+1 -2
drivers/acpi/power.c
··· 42 42 #include <linux/slab.h> 43 43 #include <linux/pm_runtime.h> 44 44 #include <linux/sysfs.h> 45 - #include <acpi/acpi_bus.h> 46 - #include <acpi/acpi_drivers.h> 45 + #include <linux/acpi.h> 47 46 #include "sleep.h" 48 47 #include "internal.h" 49 48
+1 -3
drivers/acpi/proc.c
··· 3 3 #include <linux/export.h> 4 4 #include <linux/suspend.h> 5 5 #include <linux/bcd.h> 6 + #include <linux/acpi.h> 6 7 #include <asm/uaccess.h> 7 - 8 - #include <acpi/acpi_bus.h> 9 - #include <acpi/acpi_drivers.h> 10 8 11 9 #include "sleep.h" 12 10
+1 -2
drivers/acpi/processor_core.c
··· 10 10 #include <linux/export.h> 11 11 #include <linux/dmi.h> 12 12 #include <linux/slab.h> 13 - 14 - #include <acpi/acpi_drivers.h> 13 + #include <linux/acpi.h> 15 14 #include <acpi/processor.h> 16 15 17 16 #include "internal.h"
+1 -3
drivers/acpi/processor_idle.c
··· 35 35 #include <linux/clockchips.h> 36 36 #include <linux/cpuidle.h> 37 37 #include <linux/syscore_ops.h> 38 + #include <acpi/processor.h> 38 39 39 40 /* 40 41 * Include the apic definitions for x86 to have the APIC timer related defines ··· 46 45 #ifdef CONFIG_X86 47 46 #include <asm/apic.h> 48 47 #endif 49 - 50 - #include <acpi/acpi_bus.h> 51 - #include <acpi/processor.h> 52 48 53 49 #define PREFIX "ACPI: " 54 50
+2 -5
drivers/acpi/processor_perflib.c
··· 31 31 #include <linux/init.h> 32 32 #include <linux/cpufreq.h> 33 33 #include <linux/slab.h> 34 - 34 + #include <linux/acpi.h> 35 + #include <acpi/processor.h> 35 36 #ifdef CONFIG_X86 36 37 #include <asm/cpufeature.h> 37 38 #endif 38 - 39 - #include <acpi/acpi_bus.h> 40 - #include <acpi/acpi_drivers.h> 41 - #include <acpi/processor.h> 42 39 43 40 #define PREFIX "ACPI: " 44 41
+2 -5
drivers/acpi/processor_thermal.c
··· 30 30 #include <linux/module.h> 31 31 #include <linux/init.h> 32 32 #include <linux/cpufreq.h> 33 - 34 - #include <asm/uaccess.h> 35 - 36 - #include <acpi/acpi_bus.h> 33 + #include <linux/acpi.h> 37 34 #include <acpi/processor.h> 38 - #include <acpi/acpi_drivers.h> 35 + #include <asm/uaccess.h> 39 36 40 37 #define PREFIX "ACPI: " 41 38
+2 -5
drivers/acpi/processor_throttling.c
··· 32 32 #include <linux/init.h> 33 33 #include <linux/sched.h> 34 34 #include <linux/cpufreq.h> 35 - 35 + #include <linux/acpi.h> 36 + #include <acpi/processor.h> 36 37 #include <asm/io.h> 37 38 #include <asm/uaccess.h> 38 - 39 - #include <acpi/acpi_bus.h> 40 - #include <acpi/acpi_drivers.h> 41 - #include <acpi/processor.h> 42 39 43 40 #define PREFIX "ACPI: " 44 41
+1 -2
drivers/acpi/sbshc.c
··· 8 8 * the Free Software Foundation version 2. 9 9 */ 10 10 11 - #include <acpi/acpi_bus.h> 12 - #include <acpi/acpi_drivers.h> 11 + #include <linux/acpi.h> 13 12 #include <linux/wait.h> 14 13 #include <linux/slab.h> 15 14 #include <linux/delay.h>
-2
drivers/acpi/scan.c
··· 12 12 #include <linux/dmi.h> 13 13 #include <linux/nls.h> 14 14 15 - #include <acpi/acpi_drivers.h> 16 - 17 15 #include <asm/pgtable.h> 18 16 19 17 #include "internal.h"
-4
drivers/acpi/sleep.c
··· 18 18 #include <linux/reboot.h> 19 19 #include <linux/acpi.h> 20 20 #include <linux/module.h> 21 - 22 21 #include <asm/io.h> 23 - 24 - #include <acpi/acpi_bus.h> 25 - #include <acpi/acpi_drivers.h> 26 22 27 23 #include "internal.h" 28 24 #include "sleep.h"
+1 -1
drivers/acpi/sysfs.c
··· 5 5 #include <linux/init.h> 6 6 #include <linux/kernel.h> 7 7 #include <linux/moduleparam.h> 8 - #include <acpi/acpi_drivers.h> 8 + #include <linux/acpi.h> 9 9 10 10 #include "internal.h" 11 11
+2 -3
drivers/acpi/thermal.c
··· 41 41 #include <linux/kmod.h> 42 42 #include <linux/reboot.h> 43 43 #include <linux/device.h> 44 - #include <asm/uaccess.h> 45 44 #include <linux/thermal.h> 46 - #include <acpi/acpi_bus.h> 47 - #include <acpi/acpi_drivers.h> 45 + #include <linux/acpi.h> 46 + #include <asm/uaccess.h> 48 47 49 48 #define PREFIX "ACPI: " 50 49
-2
drivers/acpi/utils.c
··· 30 30 #include <linux/types.h> 31 31 #include <linux/hardirq.h> 32 32 #include <linux/acpi.h> 33 - #include <acpi/acpi_bus.h> 34 - #include <acpi/acpi_drivers.h> 35 33 36 34 #include "internal.h" 37 35
+2 -3
drivers/acpi/video.c
··· 37 37 #include <linux/pci.h> 38 38 #include <linux/pci_ids.h> 39 39 #include <linux/slab.h> 40 - #include <asm/uaccess.h> 41 40 #include <linux/dmi.h> 42 - #include <acpi/acpi_bus.h> 43 - #include <acpi/acpi_drivers.h> 44 41 #include <linux/suspend.h> 42 + #include <linux/acpi.h> 45 43 #include <acpi/video.h> 44 + #include <asm/uaccess.h> 46 45 47 46 #include "internal.h" 48 47
-1
drivers/acpi/wakeup.c
··· 5 5 6 6 #include <linux/init.h> 7 7 #include <linux/acpi.h> 8 - #include <acpi/acpi_drivers.h> 9 8 #include <linux/kernel.h> 10 9 #include <linux/types.h> 11 10
-2
drivers/ata/libata-acpi.c
··· 20 20 #include <scsi/scsi_device.h> 21 21 #include "libata.h" 22 22 23 - #include <acpi/acpi_bus.h> 24 - 25 23 unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; 26 24 module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644); 27 25 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)");
+2 -3
drivers/ata/pata_acpi.c
··· 12 12 #include <linux/delay.h> 13 13 #include <linux/device.h> 14 14 #include <linux/gfp.h> 15 - #include <scsi/scsi_host.h> 16 - #include <acpi/acpi_bus.h> 17 - 15 + #include <linux/acpi.h> 18 16 #include <linux/libata.h> 19 17 #include <linux/ata.h> 18 + #include <scsi/scsi_host.h> 20 19 21 20 #define DRV_NAME "pata_acpi" 22 21 #define DRV_VERSION "0.2.3"
+2 -5
drivers/char/hpet.c
··· 34 34 #include <linux/uaccess.h> 35 35 #include <linux/slab.h> 36 36 #include <linux/io.h> 37 - 37 + #include <linux/acpi.h> 38 + #include <linux/hpet.h> 38 39 #include <asm/current.h> 39 40 #include <asm/irq.h> 40 41 #include <asm/div64.h> 41 - 42 - #include <linux/acpi.h> 43 - #include <acpi/acpi_bus.h> 44 - #include <linux/hpet.h> 45 42 46 43 /* 47 44 * The High Precision Event Timer driver.
+1 -1
drivers/char/tpm/tpm_acpi.c
··· 23 23 #include <linux/security.h> 24 24 #include <linux/module.h> 25 25 #include <linux/slab.h> 26 - #include <acpi/acpi.h> 26 + #include <linux/acpi.h> 27 27 28 28 #include "tpm.h" 29 29 #include "tpm_eventlog.h"
-1
drivers/char/tpm/tpm_ppi.c
··· 1 1 #include <linux/acpi.h> 2 - #include <acpi/acpi_drivers.h> 3 2 #include "tpm.h" 4 3 5 4 static const u8 tpm_ppi_uuid[] = {
-2
drivers/gpu/drm/i915/intel_acpi.c
··· 6 6 #include <linux/pci.h> 7 7 #include <linux/acpi.h> 8 8 #include <linux/vga_switcheroo.h> 9 - #include <acpi/acpi_drivers.h> 10 - 11 9 #include <drm/drmP.h> 12 10 #include "i915_drv.h" 13 11
+1 -6
drivers/gpu/drm/nouveau/nouveau_acpi.c
··· 1 1 #include <linux/pci.h> 2 2 #include <linux/acpi.h> 3 3 #include <linux/slab.h> 4 - #include <acpi/acpi_drivers.h> 5 - #include <acpi/acpi_bus.h> 6 - #include <acpi/video.h> 7 - #include <acpi/acpi.h> 8 4 #include <linux/mxm-wmi.h> 9 - 10 5 #include <linux/vga_switcheroo.h> 11 - 12 6 #include <drm/drm_edid.h> 7 + #include <acpi/video.h> 13 8 14 9 #include "nouveau_drm.h" 15 10 #include "nouveau_acpi.h"
+1 -5
drivers/gpu/drm/radeon/radeon_acpi.c
··· 25 25 #include <linux/acpi.h> 26 26 #include <linux/slab.h> 27 27 #include <linux/power_supply.h> 28 - #include <acpi/acpi_drivers.h> 29 - #include <acpi/acpi_bus.h> 28 + #include <linux/vga_switcheroo.h> 30 29 #include <acpi/video.h> 31 - 32 30 #include <drm/drmP.h> 33 31 #include <drm/drm_crtc_helper.h> 34 32 #include "radeon.h" 35 33 #include "radeon_acpi.h" 36 34 #include "atom.h" 37 - 38 - #include <linux/vga_switcheroo.h> 39 35 40 36 #define ACPI_AC_CLASS "ac_adapter" 41 37
-2
drivers/hv/vmbus_drv.c
··· 30 30 #include <linux/sysctl.h> 31 31 #include <linux/slab.h> 32 32 #include <linux/acpi.h> 33 - #include <acpi/acpi_bus.h> 34 33 #include <linux/completion.h> 35 34 #include <linux/hyperv.h> 36 35 #include <linux/kernel_stat.h> ··· 37 38 #include <asm/hypervisor.h> 38 39 #include <asm/mshyperv.h> 39 40 #include "hyperv_vmbus.h" 40 - 41 41 42 42 static struct acpi_device *hv_acpi_dev; 43 43
+1 -2
drivers/hwmon/acpi_power_meter.c
··· 30 30 #include <linux/sched.h> 31 31 #include <linux/time.h> 32 32 #include <linux/err.h> 33 - #include <acpi/acpi_drivers.h> 34 - #include <acpi/acpi_bus.h> 33 + #include <linux/acpi.h> 35 34 36 35 #define ACPI_POWER_METER_NAME "power_meter" 37 36 ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);
+1 -6
drivers/hwmon/asus_atk0110.c
··· 16 16 #include <linux/dmi.h> 17 17 #include <linux/jiffies.h> 18 18 #include <linux/err.h> 19 - 20 - #include <acpi/acpi.h> 21 - #include <acpi/acpixf.h> 22 - #include <acpi/acpi_drivers.h> 23 - #include <acpi/acpi_bus.h> 24 - 19 + #include <linux/acpi.h> 25 20 26 21 #define ATK_HID "ATK0110" 27 22
-1
drivers/ide/ide-acpi.c
··· 14 14 #include <linux/errno.h> 15 15 #include <linux/kernel.h> 16 16 #include <linux/slab.h> 17 - #include <acpi/acpi.h> 18 17 #include <linux/ide.h> 19 18 #include <linux/pci.h> 20 19 #include <linux/dmi.h>
+1 -1
drivers/input/misc/atlas_btns.c
··· 28 28 #include <linux/init.h> 29 29 #include <linux/input.h> 30 30 #include <linux/types.h> 31 + #include <linux/acpi.h> 31 32 #include <asm/uaccess.h> 32 - #include <acpi/acpi_drivers.h> 33 33 34 34 #define ACPI_ATLAS_NAME "Atlas ACPI" 35 35 #define ACPI_ATLAS_CLASS "Atlas"
-1
drivers/iommu/amd_iommu_init.c
··· 26 26 #include <linux/msi.h> 27 27 #include <linux/amd-iommu.h> 28 28 #include <linux/export.h> 29 - #include <acpi/acpi.h> 30 29 #include <asm/pci-direct.h> 31 30 #include <asm/iommu.h> 32 31 #include <asm/gart.h>
+2 -2
drivers/iommu/intel_irq_remapping.c
··· 6 6 #include <linux/hpet.h> 7 7 #include <linux/pci.h> 8 8 #include <linux/irq.h> 9 + #include <linux/intel-iommu.h> 10 + #include <linux/acpi.h> 9 11 #include <asm/io_apic.h> 10 12 #include <asm/smp.h> 11 13 #include <asm/cpu.h> 12 - #include <linux/intel-iommu.h> 13 - #include <acpi/acpi.h> 14 14 #include <asm/irq_remapping.h> 15 15 #include <asm/pci-direct.h> 16 16 #include <asm/msidef.h>
+1 -2
drivers/pci/hotplug/acpiphp_ibm.c
··· 31 31 #include <linux/slab.h> 32 32 #include <linux/module.h> 33 33 #include <linux/kernel.h> 34 - #include <acpi/acpi_bus.h> 35 34 #include <linux/sysfs.h> 36 35 #include <linux/kobject.h> 37 - #include <asm/uaccess.h> 38 36 #include <linux/moduleparam.h> 39 37 #include <linux/pci.h> 38 + #include <asm/uaccess.h> 40 39 41 40 #include "acpiphp.h" 42 41 #include "../pci.h"
-2
drivers/pci/hotplug/pciehp.h
··· 163 163 } 164 164 165 165 #ifdef CONFIG_ACPI 166 - #include <acpi/acpi.h> 167 - #include <acpi/acpi_bus.h> 168 166 #include <linux/pci-acpi.h> 169 167 170 168 void __init pciehp_acpi_slot_detection_init(void);
-1
drivers/pci/ioapic.c
··· 20 20 #include <linux/module.h> 21 21 #include <linux/acpi.h> 22 22 #include <linux/slab.h> 23 - #include <acpi/acpi_bus.h> 24 23 25 24 struct ioapic { 26 25 acpi_handle handle;
-3
drivers/pci/pci-acpi.c
··· 12 12 #include <linux/pci.h> 13 13 #include <linux/module.h> 14 14 #include <linux/pci-aspm.h> 15 - #include <acpi/acpi.h> 16 - #include <acpi/acpi_bus.h> 17 - 18 15 #include <linux/pci-acpi.h> 19 16 #include <linux/pm_runtime.h> 20 17 #include <linux/pm_qos.h>
-1
drivers/pci/pci-label.c
··· 29 29 #include <linux/nls.h> 30 30 #include <linux/acpi.h> 31 31 #include <linux/pci-acpi.h> 32 - #include <acpi/acpi_bus.h> 33 32 #include "pci.h" 34 33 35 34 #define DEVICE_LABEL_DSM 0x07
-2
drivers/platform/x86/acer-wmi.c
··· 41 41 #include <linux/slab.h> 42 42 #include <linux/input.h> 43 43 #include <linux/input/sparse-keymap.h> 44 - 45 - #include <acpi/acpi_drivers.h> 46 44 #include <acpi/video.h> 47 45 48 46 MODULE_AUTHOR("Carlos Corbacho");
+1 -2
drivers/platform/x86/asus-laptop.c
··· 53 53 #include <linux/rfkill.h> 54 54 #include <linux/slab.h> 55 55 #include <linux/dmi.h> 56 - #include <acpi/acpi_drivers.h> 57 - #include <acpi/acpi_bus.h> 56 + #include <linux/acpi.h> 58 57 59 58 #define ASUS_LAPTOP_VERSION "0.42" 60 59
+1 -2
drivers/platform/x86/asus-wmi.c
··· 45 45 #include <linux/seq_file.h> 46 46 #include <linux/platform_device.h> 47 47 #include <linux/thermal.h> 48 - #include <acpi/acpi_bus.h> 49 - #include <acpi/acpi_drivers.h> 48 + #include <linux/acpi.h> 50 49 #include <acpi/video.h> 51 50 52 51 #include "asus-wmi.h"
+1 -2
drivers/platform/x86/classmate-laptop.c
··· 21 21 #include <linux/module.h> 22 22 #include <linux/slab.h> 23 23 #include <linux/workqueue.h> 24 - #include <acpi/acpi_drivers.h> 24 + #include <linux/acpi.h> 25 25 #include <linux/backlight.h> 26 26 #include <linux/input.h> 27 27 #include <linux/rfkill.h> 28 28 29 29 MODULE_LICENSE("GPL"); 30 - 31 30 32 31 struct cmpc_accel { 33 32 int sensitivity;
-1
drivers/platform/x86/dell-wmi-aio.c
··· 24 24 #include <linux/types.h> 25 25 #include <linux/input.h> 26 26 #include <linux/input/sparse-keymap.h> 27 - #include <acpi/acpi_drivers.h> 28 27 #include <linux/acpi.h> 29 28 #include <linux/string.h> 30 29
-1
drivers/platform/x86/dell-wmi.c
··· 32 32 #include <linux/types.h> 33 33 #include <linux/input.h> 34 34 #include <linux/input/sparse-keymap.h> 35 - #include <acpi/acpi_drivers.h> 36 35 #include <linux/acpi.h> 37 36 #include <linux/string.h> 38 37 #include <linux/dmi.h>
+1 -2
drivers/platform/x86/eeepc-laptop.c
··· 28 28 #include <linux/hwmon.h> 29 29 #include <linux/hwmon-sysfs.h> 30 30 #include <linux/slab.h> 31 - #include <acpi/acpi_drivers.h> 32 - #include <acpi/acpi_bus.h> 31 + #include <linux/acpi.h> 33 32 #include <linux/uaccess.h> 34 33 #include <linux/input.h> 35 34 #include <linux/input/sparse-keymap.h>
+1 -1
drivers/platform/x86/eeepc-wmi.c
··· 33 33 #include <linux/input/sparse-keymap.h> 34 34 #include <linux/dmi.h> 35 35 #include <linux/fb.h> 36 - #include <acpi/acpi_bus.h> 36 + #include <linux/acpi.h> 37 37 38 38 #include "asus-wmi.h" 39 39
+1 -1
drivers/platform/x86/hp_accel.c
··· 36 36 #include <linux/uaccess.h> 37 37 #include <linux/leds.h> 38 38 #include <linux/atomic.h> 39 - #include <acpi/acpi_drivers.h> 39 + #include <linux/acpi.h> 40 40 #include "../../misc/lis3lv02d/lis3lv02d.h" 41 41 42 42 #define DRIVER_NAME "hp_accel"
+1 -2
drivers/platform/x86/ideapad-laptop.c
··· 26 26 #include <linux/module.h> 27 27 #include <linux/init.h> 28 28 #include <linux/types.h> 29 - #include <acpi/acpi_bus.h> 30 - #include <acpi/acpi_drivers.h> 29 + #include <linux/acpi.h> 31 30 #include <linux/rfkill.h> 32 31 #include <linux/platform_device.h> 33 32 #include <linux/input.h>
+1 -1
drivers/platform/x86/intel-rst.c
··· 20 20 #include <linux/init.h> 21 21 #include <linux/module.h> 22 22 #include <linux/slab.h> 23 - #include <acpi/acpi_drivers.h> 23 + #include <linux/acpi.h> 24 24 25 25 MODULE_LICENSE("GPL"); 26 26
+1 -1
drivers/platform/x86/intel-smartconnect.c
··· 19 19 20 20 #include <linux/init.h> 21 21 #include <linux/module.h> 22 - #include <acpi/acpi_drivers.h> 22 + #include <linux/acpi.h> 23 23 24 24 MODULE_LICENSE("GPL"); 25 25
+1 -3
drivers/platform/x86/intel_menlow.c
··· 36 36 #include <linux/types.h> 37 37 #include <linux/pci.h> 38 38 #include <linux/pm.h> 39 - 40 39 #include <linux/thermal.h> 41 - #include <acpi/acpi_bus.h> 42 - #include <acpi/acpi_drivers.h> 40 + #include <linux/acpi.h> 43 41 44 42 MODULE_AUTHOR("Thomas Sujith"); 45 43 MODULE_AUTHOR("Zhang Rui");
-3
drivers/platform/x86/intel_oaktrail.c
··· 50 50 #include <linux/platform_device.h> 51 51 #include <linux/dmi.h> 52 52 #include <linux/rfkill.h> 53 - #include <acpi/acpi_bus.h> 54 - #include <acpi/acpi_drivers.h> 55 - 56 53 57 54 #define DRIVER_NAME "intel_oaktrail" 58 55 #define DRIVER_VERSION "0.4ac1"
+1 -2
drivers/platform/x86/mxm-wmi.c
··· 20 20 #include <linux/kernel.h> 21 21 #include <linux/module.h> 22 22 #include <linux/init.h> 23 - #include <acpi/acpi_bus.h> 24 - #include <acpi/acpi_drivers.h> 23 + #include <linux/acpi.h> 25 24 26 25 MODULE_AUTHOR("Dave Airlie"); 27 26 MODULE_DESCRIPTION("MXM WMI Driver");
+1 -3
drivers/platform/x86/panasonic-laptop.c
··· 125 125 #include <linux/seq_file.h> 126 126 #include <linux/uaccess.h> 127 127 #include <linux/slab.h> 128 - #include <acpi/acpi_bus.h> 129 - #include <acpi/acpi_drivers.h> 128 + #include <linux/acpi.h> 130 129 #include <linux/input.h> 131 130 #include <linux/input/sparse-keymap.h> 132 - 133 131 134 132 #ifndef ACPI_HOTKEY_COMPONENT 135 133 #define ACPI_HOTKEY_COMPONENT 0x10000000
+1 -2
drivers/platform/x86/pvpanic.c
··· 24 24 #include <linux/module.h> 25 25 #include <linux/init.h> 26 26 #include <linux/types.h> 27 - #include <acpi/acpi_bus.h> 28 - #include <acpi/acpi_drivers.h> 27 + #include <linux/acpi.h> 29 28 30 29 MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>"); 31 30 MODULE_DESCRIPTION("pvpanic device driver");
+1 -1
drivers/platform/x86/samsung-q10.c
··· 15 15 #include <linux/platform_device.h> 16 16 #include <linux/backlight.h> 17 17 #include <linux/dmi.h> 18 - #include <acpi/acpi_drivers.h> 18 + #include <linux/acpi.h> 19 19 20 20 #define SAMSUNGQ10_BL_MAX_INTENSITY 7 21 21
+1 -3
drivers/platform/x86/sony-laptop.c
··· 61 61 #include <linux/workqueue.h> 62 62 #include <linux/acpi.h> 63 63 #include <linux/slab.h> 64 - #include <acpi/acpi_drivers.h> 65 - #include <acpi/acpi_bus.h> 66 - #include <asm/uaccess.h> 67 64 #include <linux/sonypi.h> 68 65 #include <linux/sony-laptop.h> 69 66 #include <linux/rfkill.h> ··· 68 71 #include <linux/poll.h> 69 72 #include <linux/miscdevice.h> 70 73 #endif 74 + #include <asm/uaccess.h> 71 75 72 76 #define dprintk(fmt, ...) \ 73 77 do { \
+1 -3
drivers/platform/x86/tc1100-wmi.c
··· 32 32 #include <linux/slab.h> 33 33 #include <linux/init.h> 34 34 #include <linux/types.h> 35 - #include <acpi/acpi.h> 36 - #include <acpi/acpi_bus.h> 37 - #include <acpi/acpi_drivers.h> 35 + #include <linux/acpi.h> 38 36 #include <linux/platform_device.h> 39 37 40 38 #define GUID "C364AC71-36DB-495A-8494-B439D472A505"
+4 -10
drivers/platform/x86/thinkpad_acpi.c
··· 61 61 #include <linux/freezer.h> 62 62 #include <linux/delay.h> 63 63 #include <linux/slab.h> 64 - 65 64 #include <linux/nvram.h> 66 65 #include <linux/proc_fs.h> 67 66 #include <linux/seq_file.h> ··· 73 74 #include <linux/input.h> 74 75 #include <linux/leds.h> 75 76 #include <linux/rfkill.h> 76 - #include <asm/uaccess.h> 77 - 78 77 #include <linux/dmi.h> 79 78 #include <linux/jiffies.h> 80 79 #include <linux/workqueue.h> 81 - 80 + #include <linux/acpi.h> 81 + #include <linux/pci_ids.h> 82 + #include <linux/thinkpad_acpi.h> 82 83 #include <sound/core.h> 83 84 #include <sound/control.h> 84 85 #include <sound/initval.h> 85 - 86 - #include <acpi/acpi_drivers.h> 87 - 88 - #include <linux/pci_ids.h> 89 - 90 - #include <linux/thinkpad_acpi.h> 86 + #include <asm/uaccess.h> 91 87 92 88 /* ThinkPad CMOS commands */ 93 89 #define TP_CMOS_VOLUME_DOWN 0
+1 -3
drivers/platform/x86/toshiba_acpi.c
··· 54 54 #include <linux/slab.h> 55 55 #include <linux/workqueue.h> 56 56 #include <linux/i8042.h> 57 - 57 + #include <linux/acpi.h> 58 58 #include <asm/uaccess.h> 59 - 60 - #include <acpi/acpi_drivers.h> 61 59 62 60 MODULE_AUTHOR("John Belmonte"); 63 61 MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver");
+1 -3
drivers/platform/x86/toshiba_bluetooth.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/init.h> 25 25 #include <linux/types.h> 26 - #include <acpi/acpi_bus.h> 27 - #include <acpi/acpi_drivers.h> 26 + #include <linux/acpi.h> 28 27 29 28 MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@gmail.com>"); 30 29 MODULE_DESCRIPTION("Toshiba Laptop ACPI Bluetooth Enable Driver"); 31 30 MODULE_LICENSE("GPL"); 32 - 33 31 34 32 static int toshiba_bt_rfkill_add(struct acpi_device *device); 35 33 static int toshiba_bt_rfkill_remove(struct acpi_device *device);
-2
drivers/platform/x86/wmi.c
··· 37 37 #include <linux/acpi.h> 38 38 #include <linux/slab.h> 39 39 #include <linux/module.h> 40 - #include <acpi/acpi_bus.h> 41 - #include <acpi/acpi_drivers.h> 42 40 43 41 ACPI_MODULE_NAME("wmi"); 44 42 MODULE_AUTHOR("Carlos Corbacho");
+1 -2
drivers/platform/x86/xo15-ebook.c
··· 18 18 #include <linux/init.h> 19 19 #include <linux/types.h> 20 20 #include <linux/input.h> 21 - #include <acpi/acpi_bus.h> 22 - #include <acpi/acpi_drivers.h> 21 + #include <linux/acpi.h> 23 22 24 23 #define MODULE_NAME "xo15-ebook" 25 24
-1
drivers/pnp/pnpacpi/core.c
··· 24 24 #include <linux/pnp.h> 25 25 #include <linux/slab.h> 26 26 #include <linux/mod_devicetable.h> 27 - #include <acpi/acpi_bus.h> 28 27 29 28 #include "../base.h" 30 29 #include "pnpacpi.h"
-1
drivers/pnp/pnpacpi/pnpacpi.h
··· 1 1 #ifndef ACPI_PNP_H 2 2 #define ACPI_PNP_H 3 3 4 - #include <acpi/acpi_bus.h> 5 4 #include <linux/acpi.h> 6 5 #include <linux/pnp.h> 7 6
+1 -1
drivers/sfi/sfi_acpi.c
··· 60 60 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt 61 61 62 62 #include <linux/kernel.h> 63 - #include <acpi/acpi.h> 63 + #include <acpi/acpi.h> /* FIXME: inclusion should be removed */ 64 64 65 65 #include <linux/sfi.h> 66 66 #include "sfi_core.h"
+1 -1
drivers/staging/quickstart/quickstart.c
··· 31 31 #include <linux/module.h> 32 32 #include <linux/init.h> 33 33 #include <linux/types.h> 34 - #include <acpi/acpi_drivers.h> 34 + #include <linux/acpi.h> 35 35 #include <linux/platform_device.h> 36 36 #include <linux/input.h> 37 37
-1
drivers/usb/core/usb-acpi.c
··· 16 16 #include <linux/acpi.h> 17 17 #include <linux/pci.h> 18 18 #include <linux/usb/hcd.h> 19 - #include <acpi/acpi_bus.h> 20 19 21 20 #include "usb.h" 22 21
-3
drivers/xen/xen-acpi-cpuhotplug.c
··· 24 24 #include <linux/cpu.h> 25 25 #include <linux/acpi.h> 26 26 #include <linux/uaccess.h> 27 - #include <acpi/acpi_bus.h> 28 - #include <acpi/acpi_drivers.h> 29 27 #include <acpi/processor.h> 30 - 31 28 #include <xen/acpi.h> 32 29 #include <xen/interface/platform.h> 33 30 #include <asm/xen/hypercall.h>
-1
drivers/xen/xen-acpi-memhotplug.c
··· 22 22 #include <linux/init.h> 23 23 #include <linux/types.h> 24 24 #include <linux/acpi.h> 25 - #include <acpi/acpi_drivers.h> 26 25 #include <xen/acpi.h> 27 26 #include <xen/interface/platform.h> 28 27 #include <asm/xen/hypercall.h>
+2 -3
drivers/xen/xen-acpi-pad.c
··· 18 18 19 19 #include <linux/kernel.h> 20 20 #include <linux/types.h> 21 - #include <acpi/acpi_bus.h> 22 - #include <acpi/acpi_drivers.h> 23 - #include <asm/xen/hypercall.h> 21 + #include <linux/acpi.h> 24 22 #include <xen/interface/version.h> 25 23 #include <xen/xen-ops.h> 24 + #include <asm/xen/hypercall.h> 26 25 27 26 #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" 28 27 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
+1 -3
drivers/xen/xen-acpi-processor.c
··· 28 28 #include <linux/module.h> 29 29 #include <linux/types.h> 30 30 #include <linux/syscore_ops.h> 31 - #include <acpi/acpi_bus.h> 32 - #include <acpi/acpi_drivers.h> 31 + #include <linux/acpi.h> 33 32 #include <acpi/processor.h> 34 - 35 33 #include <xen/xen.h> 36 34 #include <xen/interface/platform.h> 37 35 #include <asm/xen/hypercall.h>
-2
include/acpi/acpi_bus.h
··· 28 28 29 29 #include <linux/device.h> 30 30 31 - #include <acpi/acpi.h> 32 - 33 31 /* TBD: Make dynamic */ 34 32 #define ACPI_MAX_HANDLES 10 35 33 struct acpi_handle_list {
-3
include/acpi/acpi_drivers.h
··· 26 26 #ifndef __ACPI_DRIVERS_H__ 27 27 #define __ACPI_DRIVERS_H__ 28 28 29 - #include <linux/acpi.h> 30 - #include <acpi/acpi_bus.h> 31 - 32 29 #define ACPI_MAX_STRING 80 33 30 34 31 /*
+1 -1
include/linux/acpi_io.h
··· 2 2 #define _ACPI_IO_H_ 3 3 4 4 #include <linux/io.h> 5 - #include <acpi/acpi.h> 5 + #include <acpi/acpi.h> /* FIXME: inclusion should be removed */ 6 6 7 7 static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, 8 8 acpi_size size)
+2 -6
include/linux/ide.h
··· 18 18 #include <linux/completion.h> 19 19 #include <linux/pm.h> 20 20 #include <linux/mutex.h> 21 - #ifdef CONFIG_BLK_DEV_IDEACPI 22 - #include <acpi/acpi.h> 23 - #endif 24 - #include <asm/byteorder.h> 25 - #include <asm/io.h> 26 - 27 21 /* for request_sense */ 28 22 #include <linux/cdrom.h> 23 + #include <asm/byteorder.h> 24 + #include <asm/io.h> 29 25 30 26 #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) 31 27 # define SUPPORT_VLB_SYNC 0
+1 -1
include/linux/iscsi_ibft.h
··· 21 21 #ifndef ISCSI_IBFT_H 22 22 #define ISCSI_IBFT_H 23 23 24 - #include <acpi/acpi.h> 24 + #include <acpi/acpi.h> /* FIXME: inclusion should be removed */ 25 25 26 26 /* 27 27 * Logical location of iSCSI Boot Format Table.
+1 -2
include/linux/pci_hotplug.h
··· 175 175 }; 176 176 177 177 #ifdef CONFIG_ACPI 178 - #include <acpi/acpi.h> 179 - #include <acpi/acpi_bus.h> 178 + #include <linux/acpi.h> 180 179 int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp); 181 180 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); 182 181 int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
+1 -1
include/linux/sfi_acpi.h
··· 60 60 #define _LINUX_SFI_ACPI_H 61 61 62 62 #ifdef CONFIG_SFI 63 - #include <acpi/acpi.h> /* struct acpi_table_header */ 63 + #include <acpi/acpi.h> /* FIXME: inclusion should be removed */ 64 64 65 65 extern int sfi_acpi_table_parse(char *signature, char *oem_id, 66 66 char *oem_table_id,
+1 -1
include/linux/tboot.h
··· 34 34 }; 35 35 36 36 #ifdef CONFIG_INTEL_TXT 37 - #include <acpi/acpi.h> 37 + #include <linux/acpi.h> 38 38 /* used to communicate between tboot and the launched kernel */ 39 39 40 40 #define TB_KEY_SIZE 64 /* 512 bits */
+1 -4
tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
··· 25 25 #include <linux/module.h> 26 26 #include <linux/init.h> 27 27 #include <linux/delay.h> 28 - 28 + #include <linux/acpi.h> 29 29 #include <asm/io.h> 30 - 31 - #include <acpi/acpi_bus.h> 32 - #include <acpi/acpi_drivers.h> 33 30 34 31 static int pm_tmr_ioport = 0; 35 32