| Message ID | 0292f01e89b52e1f6c581fc23684ea2b5f2bb1d8.1385094641.git.lv.zheng@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Saturday, November 23, 2013 07:29:08 AM Lv Zheng wrote: > From: Lv Zheng <lv.zheng@intel.com> > > This patch enfoces <linux/acpi.h> inclusion instead of direct > <acpi/acpi_drivers.h> and <acpi/acpi_bus.h> inclusions. First off, please make the changelog shorter. Here's my version: "Replace direct inclusions of <acpi/acpi_drivers.h> and <acpi/acpi_bus.h>, which are incorrect, with <linux/acpi.h> inclusions. First of all, <acpi/acpi_drivers.h> and <acpi/acpi_bus.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 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. That also is taken care of including <linux/acpi.h> as appropriate." Second, please fold [3/4] into this one. Keeping them separate is artificial and pointless in my opinion. [Of course, the changelog will have to be modified then.] [...] Apart from the above -> > Signed-off-by: Lv Zheng <lv.zheng@intel.com> > --- > arch/ia64/hp/common/aml_nfw.c | 3 +-- > arch/x86/kernel/apic/apic_flat_64.c | 4 +--- > arch/x86/kernel/apic/io_apic.c | 3 --- > arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-- > drivers/acpi/ac.c | 3 +-- > drivers/acpi/acpi_extlog.c | 1 - > drivers/acpi/acpi_pad.c | 3 +-- > drivers/acpi/battery.c | 3 +-- > drivers/acpi/blacklist.c | 1 - > drivers/acpi/bus.c | 2 -- > drivers/acpi/button.c | 3 +-- > drivers/acpi/custom_method.c | 2 +- > drivers/acpi/debugfs.c | 2 +- > drivers/acpi/dock.c | 2 -- > drivers/acpi/ec.c | 3 +-- > drivers/acpi/event.c | 2 +- > drivers/acpi/fan.c | 3 +-- > drivers/acpi/hed.c | 2 -- > drivers/acpi/numa.c | 1 - > drivers/acpi/osl.c | 1 - > drivers/acpi/pci_irq.c | 2 -- > drivers/acpi/pci_link.c | 3 +-- > drivers/acpi/pci_root.c | 2 -- > drivers/acpi/power.c | 3 +-- > drivers/acpi/proc.c | 3 +-- > drivers/acpi/processor_core.c | 2 +- > drivers/acpi/processor_idle.c | 1 - > drivers/acpi/processor_perflib.c | 3 +-- > drivers/acpi/processor_thermal.c | 3 +-- > drivers/acpi/processor_throttling.c | 3 +-- > drivers/acpi/sbshc.c | 3 +-- > drivers/acpi/scan.c | 1 - > drivers/acpi/sleep.c | 2 -- > drivers/acpi/sysfs.c | 2 +- > drivers/acpi/thermal.c | 3 +-- > drivers/acpi/utils.c | 2 -- > drivers/acpi/video.c | 3 +-- > drivers/acpi/wakeup.c | 1 - > drivers/ata/libata-acpi.c | 1 - > drivers/ata/pata_acpi.c | 2 +- > drivers/char/hpet.c | 1 - > drivers/char/tpm/tpm_ppi.c | 1 - > drivers/gpu/drm/i915/intel_acpi.c | 1 - > drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 -- > drivers/gpu/drm/radeon/radeon_acpi.c | 2 -- > drivers/hv/vmbus_drv.c | 1 - > drivers/hwmon/acpi_power_meter.c | 3 +-- > drivers/hwmon/asus_atk0110.c | 3 +-- > drivers/input/misc/atlas_btns.c | 2 +- > drivers/pci/hotplug/acpiphp_ibm.c | 1 - > drivers/pci/hotplug/pciehp.h | 1 - > drivers/pci/ioapic.c | 1 - > drivers/pci/pci-acpi.c | 1 - > drivers/pci/pci-label.c | 1 - > drivers/platform/x86/acer-wmi.c | 1 - > drivers/platform/x86/asus-laptop.c | 3 +-- > drivers/platform/x86/asus-wmi.c | 3 +-- > drivers/platform/x86/classmate-laptop.c | 2 +- > drivers/platform/x86/dell-wmi-aio.c | 1 - > drivers/platform/x86/dell-wmi.c | 1 - > drivers/platform/x86/eeepc-laptop.c | 3 +-- > drivers/platform/x86/eeepc-wmi.c | 2 +- > drivers/platform/x86/hp_accel.c | 2 +- > drivers/platform/x86/ideapad-laptop.c | 3 +-- > drivers/platform/x86/intel-rst.c | 2 +- > drivers/platform/x86/intel-smartconnect.c | 2 +- > drivers/platform/x86/intel_menlow.c | 3 +-- > drivers/platform/x86/intel_oaktrail.c | 2 -- > drivers/platform/x86/mxm-wmi.c | 3 +-- > drivers/platform/x86/panasonic-laptop.c | 3 +-- > drivers/platform/x86/pvpanic.c | 3 +-- > drivers/platform/x86/samsung-q10.c | 2 +- > drivers/platform/x86/sony-laptop.c | 2 -- > drivers/platform/x86/tc1100-wmi.c | 3 +-- > drivers/platform/x86/thinkpad_acpi.c | 2 +- > drivers/platform/x86/toshiba_acpi.c | 2 +- > drivers/platform/x86/toshiba_bluetooth.c | 3 +-- > drivers/platform/x86/wmi.c | 2 -- > drivers/platform/x86/xo15-ebook.c | 3 +-- > drivers/pnp/pnpacpi/core.c | 1 - > drivers/pnp/pnpacpi/pnpacpi.h | 1 - > drivers/staging/quickstart/quickstart.c | 2 +- > drivers/usb/core/usb-acpi.c | 1 - > drivers/xen/xen-acpi-cpuhotplug.c | 2 -- > drivers/xen/xen-acpi-memhotplug.c | 1 - > drivers/xen/xen-acpi-pad.c | 3 +-- > drivers/xen/xen-acpi-processor.c | 3 +-- > include/acpi/acpi_bus.h | 1 - > include/acpi/acpi_drivers.h | 2 -- > include/linux/pci_hotplug.h | 2 +- > tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 3 +-- > 91 files changed, 51 insertions(+), 142 deletions(-) > > diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c > index 916ffe7..84715fc 100644 > --- a/arch/ia64/hp/common/aml_nfw.c > +++ b/arch/ia64/hp/common/aml_nfw.c > @@ -23,8 +23,7 @@ > */ > > #include <linux/module.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <asm/sal.h> > > MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>"); > diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c > index 00c77cf..ccbf857 100644 > --- a/arch/x86/kernel/apic/apic_flat_64.c > +++ b/arch/x86/kernel/apic/apic_flat_64.c > @@ -21,9 +21,7 @@ > #include <asm/apic.h> > #include <asm/ipi.h> > > -#ifdef CONFIG_ACPI > -#include <acpi/acpi_bus.h> > -#endif > +#include <linux/acpi.h> > > static struct apic apic_physflat; > static struct apic apic_flat; > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c > index e63a5bd..4d67a75 100644 > --- a/arch/x86/kernel/apic/io_apic.c > +++ b/arch/x86/kernel/apic/io_apic.c > @@ -37,9 +37,6 @@ > #include <linux/kthread.h> > #include <linux/jiffies.h> /* time_after() */ > #include <linux/slab.h> > -#ifdef CONFIG_ACPI > -#include <acpi/acpi_bus.h> > -#endif > #include <linux/bootmem.h> > #include <linux/dmar.h> > #include <linux/hpet.h> > diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c > index 649a12b..08e350e 100644 > --- a/arch/x86/platform/olpc/olpc-xo15-sci.c > +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c > @@ -15,8 +15,7 @@ > #include <linux/power_supply.h> > #include <linux/olpc-ec.h> > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <asm/olpc.h> > > #define DRV_NAME "olpc-xo15-sci" > diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c > index 8711e37..8095943 100644 > --- a/drivers/acpi/ac.c > +++ b/drivers/acpi/ac.c > @@ -32,8 +32,7 @@ > #include <linux/delay.h> > #include <linux/platform_device.h> > #include <linux/power_supply.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c > index a6869e1..2635a01 100644 > --- a/drivers/acpi/acpi_extlog.c > +++ b/drivers/acpi/acpi_extlog.c > @@ -9,7 +9,6 @@ > > #include <linux/module.h> > #include <linux/acpi.h> > -#include <acpi/acpi_bus.h> > #include <linux/cper.h> > #include <linux/ratelimit.h> > #include <asm/cpu.h> > diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c > index fc6008f..65610c0 100644 > --- a/drivers/acpi/acpi_pad.c > +++ b/drivers/acpi/acpi_pad.c > @@ -28,8 +28,7 @@ > #include <linux/cpu.h> > #include <linux/clockchips.h> > #include <linux/slab.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <asm/mwait.h> > > #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c > index fbf1ace..e90ef8b 100644 > --- a/drivers/acpi/battery.c > +++ b/drivers/acpi/battery.c > @@ -36,8 +36,7 @@ > #include <linux/suspend.h> > #include <asm/unaligned.h> > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <linux/power_supply.h> > > #define PREFIX "ACPI: " > diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c > index 078c4f7..05ee8f6 100644 > --- a/drivers/acpi/blacklist.c > +++ b/drivers/acpi/blacklist.c > @@ -30,7 +30,6 @@ > #include <linux/kernel.h> > #include <linux/init.h> > #include <linux/acpi.h> > -#include <acpi/acpi_bus.h> > #include <linux/dmi.h> > > #include "internal.h" > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index bba9b72..cfea1c5 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -37,8 +37,6 @@ > #include <asm/mpspec.h> > #endif > #include <linux/pci.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > #include <acpi/apei.h> > #include <linux/dmi.h> > #include <linux/suspend.h> > diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c > index c971929..9e3a6cb 100644 > --- a/drivers/acpi/button.c > +++ b/drivers/acpi/button.c > @@ -31,8 +31,7 @@ > #include <linux/seq_file.h> > #include <linux/input.h> > #include <linux/slab.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <acpi/button.h> > > #define PREFIX "ACPI: " > diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c > index 12b62f2..c68e724 100644 > --- a/drivers/acpi/custom_method.c > +++ b/drivers/acpi/custom_method.c > @@ -7,7 +7,7 @@ > #include <linux/kernel.h> > #include <linux/uaccess.h> > #include <linux/debugfs.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > > #include "internal.h" > > diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c > index b55d6a2..6b1919f 100644 > --- a/drivers/acpi/debugfs.c > +++ b/drivers/acpi/debugfs.c > @@ -5,7 +5,7 @@ > #include <linux/export.h> > #include <linux/init.h> > #include <linux/debugfs.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > > #define _COMPONENT ACPI_SYSTEM_COMPONENT > ACPI_MODULE_NAME("debugfs"); > diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c > index dcd73cc..9ab9e78 100644 > --- a/drivers/acpi/dock.c > +++ b/drivers/acpi/dock.c > @@ -32,8 +32,6 @@ > #include <linux/jiffies.h> > #include <linux/stddef.h> > #include <linux/acpi.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > index ba5b56d..1bd3de4 100644 > --- a/drivers/acpi/ec.c > +++ b/drivers/acpi/ec.c > @@ -40,8 +40,7 @@ > #include <linux/spinlock.h> > #include <linux/slab.h> > #include <asm/io.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> -> add the new #include above the <asm/io.h> maybe? > #include <linux/dmi.h> > > #include "internal.h" > diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c > index cae3b38..ef2d730 100644 > --- a/drivers/acpi/event.c > +++ b/drivers/acpi/event.c > @@ -12,7 +12,7 @@ > #include <linux/init.h> > #include <linux/poll.h> > #include <linux/gfp.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <net/netlink.h> > #include <net/genetlink.h> > > diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c > index ba3da88..1fb6290 100644 > --- a/drivers/acpi/fan.c > +++ b/drivers/acpi/fan.c > @@ -29,8 +29,7 @@ > #include <linux/types.h> > #include <asm/uaccess.h> > #include <linux/thermal.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c > index 13b1d39..aafe3ca 100644 > --- a/drivers/acpi/hed.c > +++ b/drivers/acpi/hed.c > @@ -25,8 +25,6 @@ > #include <linux/module.h> > #include <linux/init.h> > #include <linux/acpi.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > #include <acpi/hed.h> > > static struct acpi_device_id acpi_hed_ids[] = { > diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c > index a2343a1..9e6816e 100644 > --- a/drivers/acpi/numa.c > +++ b/drivers/acpi/numa.c > @@ -29,7 +29,6 @@ > #include <linux/errno.h> > #include <linux/acpi.h> > #include <linux/numa.h> > -#include <acpi/acpi_bus.h> > > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c > index 54a20ff..8507034 100644 > --- a/drivers/acpi/osl.c > +++ b/drivers/acpi/osl.c > @@ -50,7 +50,6 @@ > #include <asm/uaccess.h> > > #include <acpi/acpi.h> > -#include <acpi/acpi_bus.h> > #include <acpi/processor.h> -> I guess all of these <acpi/...> inclusions may go away from here? > #include "internal.h" > > diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c > index 41c5e1b..52d45ea 100644 > --- a/drivers/acpi/pci_irq.c > +++ b/drivers/acpi/pci_irq.c > @@ -37,8 +37,6 @@ > #include <linux/pci.h> > #include <linux/acpi.h> > #include <linux/slab.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c > index 2652a61..cc5feb9 100644 > --- a/drivers/acpi/pci_link.c > +++ b/drivers/acpi/pci_link.c > @@ -40,8 +40,7 @@ > #include <linux/mutex.h> > #include <linux/slab.h> > -> Remove the empty line too. > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index 20360e4..dadd0f50 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -35,8 +35,6 @@ > #include <linux/pci-aspm.h> > #include <linux/acpi.h> > #include <linux/slab.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > #include <acpi/apei.h> Does <acpi/apei.h> have to be included directly here? If not, please remove it too. > > #include "internal.h" > diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c > index c2ad391..ad7da68 100644 > --- a/drivers/acpi/power.c > +++ b/drivers/acpi/power.c > @@ -42,8 +42,7 @@ > #include <linux/slab.h> > #include <linux/pm_runtime.h> > #include <linux/sysfs.h> > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include "sleep.h" > #include "internal.h" > > diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c > index 6a5b152..56d30fe 100644 > --- a/drivers/acpi/proc.c > +++ b/drivers/acpi/proc.c > @@ -5,8 +5,7 @@ > #include <linux/bcd.h> > #include <asm/uaccess.h> > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> -> Put the new line above the <asm/uaccess.h> > > #include "sleep.h" > > diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c > index b3171f3..ad88410 100644 > --- a/drivers/acpi/processor_core.c > +++ b/drivers/acpi/processor_core.c > @@ -11,7 +11,7 @@ > #include <linux/dmi.h> > #include <linux/slab.h> > > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <acpi/processor.h> -> Remove the useless empty line and processor.h inclusion too. > > #include "internal.h" > diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c > index 644516d..a1087d8 100644 > --- a/drivers/acpi/processor_idle.c > +++ b/drivers/acpi/processor_idle.c > @@ -46,7 +46,6 @@ > #include <asm/apic.h> > #endif > > -#include <acpi/acpi_bus.h> > #include <acpi/processor.h> Is the processor.h inclusion necessary here? > > #define PREFIX "ACPI: " > diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c > index 60a7c28..df63370 100644 > --- a/drivers/acpi/processor_perflib.c > +++ b/drivers/acpi/processor_perflib.c > @@ -36,8 +36,7 @@ > #include <asm/cpufeature.h> > #endif > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <acpi/processor.h> And here? And it's better to add #include <linux/acpi.h> to the other #include <linux/...> things. > #define PREFIX "ACPI: " > diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c > index d1d2e7f..4af89f9 100644 > --- a/drivers/acpi/processor_thermal.c > +++ b/drivers/acpi/processor_thermal.c > @@ -33,9 +33,8 @@ > > #include <asm/uaccess.h> > > -#include <acpi/acpi_bus.h> > +#include <linux/acpi.h> > #include <acpi/processor.h> > -#include <acpi/acpi_drivers.h> Same comments as above. > #define PREFIX "ACPI: " > > diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c > index e7dd2c1..a9de919 100644 > --- a/drivers/acpi/processor_throttling.c > +++ b/drivers/acpi/processor_throttling.c > @@ -36,8 +36,7 @@ > #include <asm/io.h> > #include <asm/uaccess.h> > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <acpi/processor.h> Same comments as above. > #define PREFIX "ACPI: " > diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c > index b78bc60..26e5b50 100644 > --- a/drivers/acpi/sbshc.c > +++ b/drivers/acpi/sbshc.c > @@ -8,8 +8,7 @@ > * the Free Software Foundation version 2. > */ > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > +#include <linux/acpi.h> > #include <linux/wait.h> > #include <linux/slab.h> > #include <linux/delay.h> > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index fd39459..8870277 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -12,7 +12,6 @@ > #include <linux/dmi.h> > #include <linux/nls.h> > > -#include <acpi/acpi_drivers.h> > Remove the empty line too. > #include "internal.h" > > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c > index 721e949..281e5fd 100644 > --- a/drivers/acpi/sleep.c > +++ b/drivers/acpi/sleep.c > @@ -21,8 +21,6 @@ > > #include <asm/io.h> > > -#include <acpi/acpi_bus.h> > -#include <acpi/acpi_drivers.h> > Remove the empty line too. OK, you should get the idea. Please keep things consistent and nice. :-) Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
SGksIFJhZmFlbA0KDQpUaGFua3MgZm9yIGNvbW1lbnRpbmcuDQoNCj4gRnJvbTogUmFmYWVsIEou IFd5c29ja2kgW21haWx0bzpyandAcmp3eXNvY2tpLm5ldF0NCj4gU2VudDogVHVlc2RheSwgTm92 ZW1iZXIgMjYsIDIwMTMgODowNiBBTQ0KPiANCj4gT24gU2F0dXJkYXksIE5vdmVtYmVyIDIzLCAy MDEzIDA3OjI5OjA4IEFNIEx2IFpoZW5nIHdyb3RlOg0KPiA+IEZyb206IEx2IFpoZW5nIDxsdi56 aGVuZ0BpbnRlbC5jb20+DQo+ID4NCj4gPiBUaGlzIHBhdGNoIGVuZm9jZXMgPGxpbnV4L2FjcGku aD4gaW5jbHVzaW9uIGluc3RlYWQgb2YgZGlyZWN0DQo+ID4gPGFjcGkvYWNwaV9kcml2ZXJzLmg+ IGFuZCA8YWNwaS9hY3BpX2J1cy5oPiBpbmNsdXNpb25zLg0KPiANCj4gRmlyc3Qgb2ZmLCBwbGVh c2UgbWFrZSB0aGUgY2hhbmdlbG9nIHNob3J0ZXIuICBIZXJlJ3MgbXkgdmVyc2lvbjoNCj4gDQo+ ICJSZXBsYWNlIGRpcmVjdCBpbmNsdXNpb25zIG9mIDxhY3BpL2FjcGlfZHJpdmVycy5oPiBhbmQg PGFjcGkvYWNwaV9idXMuaD4sDQo+IHdoaWNoIGFyZSBpbmNvcnJlY3QsIHdpdGggPGxpbnV4L2Fj cGkuaD4gaW5jbHVzaW9ucy4NCj4gDQo+IEZpcnN0IG9mIGFsbCwgPGFjcGkvYWNwaV9kcml2ZXJz Lmg+IGFuZCA8YWNwaS9hY3BpX2J1cy5oPiBzaG91bGQgbm90DQo+IGJlIGluY2x1ZGVkIGRpcmVj dGx5IGZyb20gYW55IGZpbGVzIHRoYXQgYXJlIGJ1aWx0IGZvciBDT05GSUdfQUNQSQ0KPiB1bnNl dCwgYmVjYXVzZSB0aGF0IGdlbmVyYWxseSBsZWFkcyB0byBidWlsZCB3YXJuaW5ncyBhYm91dCB1 bmRlZmluZWQNCj4gc3ltYm9scyBpbiAhQ09ORklHX0FDUEkgYnVpbGRzLiAgRm9yIENPTkZJR19B Q1BJIHNldCA8bGludXgvYWNwaS5oPg0KPiBpbmNsdWRlcyB0aG9zZSBmaWxlcyBhbmQgZm9yIENP TkZJR19BQ1BJIGl0IHByb3ZpZGVzIHN0dWIgQUNQSQ0KPiBzeW1ib2xzIHRvIGJlIHVzZWQgaW4g dGhhdCBjYXNlLg0KPiANCj4gU2Vjb25kLCB0aGVyZSBhcmUgb3JkZXJpbmcgZGVwZW5kZW5jaWVz IGJldHdlZW4gdGhvc2UgZmlsZXMgdGhhdA0KPiBhbHdheXMgaGF2ZSB0byBiZSBtZXQuICBOYW1l bHksIGl0IGlzIHJlcXVpcmVkIHRoYXQgPGFjcGkvYWNwaV9idXMuaD4NCj4gYmUgaW5jbHVkZWQg cHJpb3IgdG8gPGFjcGkvYWNwaV9kcml2ZXJzLmg+IHNvIHRoYXQgdGhlIGFjcGlfcGNpX3Jvb3QN Cj4gZGVjbGFyYXRpb25zIHRoZSBsYXR0ZXIgZGVwZW5kcyBvbiBhcmUgYWx3YXlzIHRoZXJlLiAg VGhhdCBhbHNvIGlzDQo+IHRha2VuIGNhcmUgb2YgaW5jbHVkaW5nIDxsaW51eC9hY3BpLmg+IGFz IGFwcHJvcHJpYXRlLiINCg0KT0suDQoNCj4gDQo+IFNlY29uZCwgcGxlYXNlIGZvbGQgWzMvNF0g aW50byB0aGlzIG9uZS4gIEtlZXBpbmcgdGhlbSBzZXBhcmF0ZSBpcw0KPiBhcnRpZmljaWFsIGFu ZCBwb2ludGxlc3MgaW4gbXkgb3Bpbmlvbi4gIFtPZiBjb3Vyc2UsIHRoZSBjaGFuZ2Vsb2cgd2ls bA0KPiBoYXZlIHRvIGJlIG1vZGlmaWVkIHRoZW4uXQ0KDQpPSy4NCg0KPiANCj4gWy4uLl0NCj4g DQo+IEFwYXJ0IGZyb20gdGhlIGFib3ZlIC0+DQo+IA0KPiA+IFNpZ25lZC1vZmYtYnk6IEx2IFpo ZW5nIDxsdi56aGVuZ0BpbnRlbC5jb20+DQo+ID4gLS0tDQpbLi4uXQ0KDQo+ID4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvYWNwaS9lYy5jIGIvZHJpdmVycy9hY3BpL2VjLmMNCj4gPiBpbmRleCBiYTVi NTZkLi4xYmQzZGU0IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvYWNwaS9lYy5jDQo+ID4gKysr IGIvZHJpdmVycy9hY3BpL2VjLmMNCj4gPiBAQCAtNDAsOCArNDAsNyBAQA0KPiA+ICAjaW5jbHVk ZSA8bGludXgvc3BpbmxvY2suaD4NCj4gPiAgI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4NCj4gPiAg I2luY2x1ZGUgPGFzbS9pby5oPg0KPiA+IC0jaW5jbHVkZSA8YWNwaS9hY3BpX2J1cy5oPg0KPiA+ IC0jaW5jbHVkZSA8YWNwaS9hY3BpX2RyaXZlcnMuaD4NCj4gPiArI2luY2x1ZGUgPGxpbnV4L2Fj cGkuaD4NCj4gDQo+IC0+IGFkZCB0aGUgbmV3ICNpbmNsdWRlIGFib3ZlIHRoZSA8YXNtL2lvLmg+ IG1heWJlPw0KDQpUaGUgcGF0Y2ggd2FzIGdlbmVyYXRlZCBmb3IgcGVvcGxlIHdobyBldmVuIGRv bid0IGhhdmUgdG9vIG1hbnkgQUNQSSBoZWFkZXIga25vd2xlZGdlIGNhbiByZXZpZXcgYW5kIGRl dGVybWluZSB0aGF0IHRoZSBtb2RpZmljYXRpb25zIHdpbGwgbm90IHRyaWdnZXIgcmVncmVzc2lv bnMuDQpTbyBpdCBkb2Vzbid0IGNsZWFudXAgb3RoZXIgZXhpc3RpbmcgaW5jbHVzaW9uIGlzc3Vl cyBmb3IgdGhlIGFmZmVjdGVkIGZpbGVzLCBmb3IgZXhhbXBsZToNCjEuIGVtcHR5IGxpbmVzLg0K Mi4gYXNtIGZpbGVzDQozLiBvdGhlciBhY3BpIGluY2x1c2lvbnMNCg0KRG8geW91IG1lYW4gSSBu ZWVkIHRvIGNsZWFudXAgd2hvbGUgZmlsZSBvdGhlciB0aGFuIHdoYXQgdGhlIHBhdGNoIGRlc2Ny aXB0aW9uIGNsYWltZWQgdG8gY2xlYW4/DQpJZiBzbywgSSdsbCBmb2xsb3cgdGhpcyBjb21tZW50 IGFuZCBhbGwgdGhlIGZvbGxvd2luZyBvbmVzIHRvIHJlZnJlc2ggdGhlIHBhdGNoLg0KDQo+IA0K PiA+ICAjaW5jbHVkZSA8bGludXgvZG1pLmg+DQo+ID4NCj4gPiAgI2luY2x1ZGUgImludGVybmFs LmgiDQoNClsuLi5dDQoNCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9hY3BpL29zbC5jIGIvZHJp dmVycy9hY3BpL29zbC5jDQo+ID4gaW5kZXggNTRhMjBmZi4uODUwNzAzNCAxMDA2NDQNCj4gPiAt LS0gYS9kcml2ZXJzL2FjcGkvb3NsLmMNCj4gPiArKysgYi9kcml2ZXJzL2FjcGkvb3NsLmMNCj4g PiBAQCAtNTAsNyArNTAsNiBAQA0KPiA+ICAjaW5jbHVkZSA8YXNtL3VhY2Nlc3MuaD4NCj4gPg0K PiA+ICAjaW5jbHVkZSA8YWNwaS9hY3BpLmg+DQo+ID4gLSNpbmNsdWRlIDxhY3BpL2FjcGlfYnVz Lmg+DQo+ID4gICNpbmNsdWRlIDxhY3BpL3Byb2Nlc3Nvci5oPg0KPiANCj4gLT4gSSBndWVzcyBh bGwgb2YgdGhlc2UgPGFjcGkvLi4uPiBpbmNsdXNpb25zIG1heSBnbyBhd2F5IGZyb20gaGVyZT8N Cj4gDQo+ID4gICNpbmNsdWRlICJpbnRlcm5hbC5oIg0KPiA+DQoNClsuLi5dDQoNCj4gPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9hY3BpL3BjaV9saW5rLmMgYi9kcml2ZXJzL2FjcGkvcGNpX2xpbmsu Yw0KPiA+IGluZGV4IDI2NTJhNjEuLmNjNWZlYjkgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9h Y3BpL3BjaV9saW5rLmMNCj4gPiArKysgYi9kcml2ZXJzL2FjcGkvcGNpX2xpbmsuYw0KPiA+IEBA IC00MCw4ICs0MCw3IEBADQo+ID4gICNpbmNsdWRlIDxsaW51eC9tdXRleC5oPg0KPiA+ICAjaW5j bHVkZSA8bGludXgvc2xhYi5oPg0KPiA+DQo+IA0KPiAtPiBSZW1vdmUgdGhlIGVtcHR5IGxpbmUg dG9vLg0KPiANCj4gPiAtI2luY2x1ZGUgPGFjcGkvYWNwaV9idXMuaD4NCj4gPiAtI2luY2x1ZGUg PGFjcGkvYWNwaV9kcml2ZXJzLmg+DQo+ID4gKyNpbmNsdWRlIDxsaW51eC9hY3BpLmg+DQo+ID4N Cj4gPiAgI2RlZmluZSBQUkVGSVggIkFDUEk6ICINCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2FjcGkvcGNpX3Jvb3QuYyBiL2RyaXZlcnMvYWNwaS9wY2lfcm9vdC5jDQo+ID4gaW5kZXgg MjAzNjBlNC4uZGFkZDBmNTAgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9hY3BpL3BjaV9yb290 LmMNCj4gPiArKysgYi9kcml2ZXJzL2FjcGkvcGNpX3Jvb3QuYw0KPiA+IEBAIC0zNSw4ICszNSw2 IEBADQo+ID4gICNpbmNsdWRlIDxsaW51eC9wY2ktYXNwbS5oPg0KPiA+ICAjaW5jbHVkZSA8bGlu dXgvYWNwaS5oPg0KPiA+ICAjaW5jbHVkZSA8bGludXgvc2xhYi5oPg0KPiA+IC0jaW5jbHVkZSA8 YWNwaS9hY3BpX2J1cy5oPg0KPiA+IC0jaW5jbHVkZSA8YWNwaS9hY3BpX2RyaXZlcnMuaD4NCj4g PiAgI2luY2x1ZGUgPGFjcGkvYXBlaS5oPg0KPiANCj4gRG9lcyA8YWNwaS9hcGVpLmg+IGhhdmUg dG8gYmUgaW5jbHVkZWQgZGlyZWN0bHkgaGVyZT8gIElmIG5vdCwgcGxlYXNlIHJlbW92ZQ0KPiBp dCB0b28uDQo+IA0KPiA+DQo+ID4gICNpbmNsdWRlICJpbnRlcm5hbC5oIg0KDQpbLi4uXQ0KDQo+ ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvYWNwaS9wcm9jLmMgYi9kcml2ZXJzL2FjcGkvcHJvYy5j DQo+ID4gaW5kZXggNmE1YjE1Mi4uNTZkMzBmZSAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL2Fj cGkvcHJvYy5jDQo+ID4gKysrIGIvZHJpdmVycy9hY3BpL3Byb2MuYw0KPiA+IEBAIC01LDggKzUs NyBAQA0KPiA+ICAjaW5jbHVkZSA8bGludXgvYmNkLmg+DQo+ID4gICNpbmNsdWRlIDxhc20vdWFj Y2Vzcy5oPg0KPiA+DQo+ID4gLSNpbmNsdWRlIDxhY3BpL2FjcGlfYnVzLmg+DQo+ID4gLSNpbmNs dWRlIDxhY3BpL2FjcGlfZHJpdmVycy5oPg0KPiA+ICsjaW5jbHVkZSA8bGludXgvYWNwaS5oPg0K PiANCj4gLT4gUHV0IHRoZSBuZXcgbGluZSBhYm92ZSB0aGUgPGFzbS91YWNjZXNzLmg+DQo+IA0K PiA+DQo+ID4gICNpbmNsdWRlICJzbGVlcC5oIg0KPiA+DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvYWNwaS9wcm9jZXNzb3JfY29yZS5jIGIvZHJpdmVycy9hY3BpL3Byb2Nlc3Nvcl9jb3JlLmMN Cj4gPiBpbmRleCBiMzE3MWYzLi5hZDg4NDEwIDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvYWNw aS9wcm9jZXNzb3JfY29yZS5jDQo+ID4gKysrIGIvZHJpdmVycy9hY3BpL3Byb2Nlc3Nvcl9jb3Jl LmMNCj4gPiBAQCAtMTEsNyArMTEsNyBAQA0KPiA+ICAjaW5jbHVkZSA8bGludXgvZG1pLmg+DQo+ ID4gICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+DQo+ID4NCj4gPiAtI2luY2x1ZGUgPGFjcGkvYWNw aV9kcml2ZXJzLmg+DQo+ID4gKyNpbmNsdWRlIDxsaW51eC9hY3BpLmg+DQo+ID4gICNpbmNsdWRl IDxhY3BpL3Byb2Nlc3Nvci5oPg0KPiANCj4gLT4gUmVtb3ZlIHRoZSB1c2VsZXNzIGVtcHR5IGxp bmUgYW5kIHByb2Nlc3Nvci5oIGluY2x1c2lvbiB0b28uDQo+IA0KPiA+DQo+ID4gICNpbmNsdWRl ICJpbnRlcm5hbC5oIg0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2FjcGkvcHJvY2Vzc29yX2lk bGUuYyBiL2RyaXZlcnMvYWNwaS9wcm9jZXNzb3JfaWRsZS5jDQo+ID4gaW5kZXggNjQ0NTE2ZC4u YTEwODdkOCAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL2FjcGkvcHJvY2Vzc29yX2lkbGUuYw0K PiA+ICsrKyBiL2RyaXZlcnMvYWNwaS9wcm9jZXNzb3JfaWRsZS5jDQo+ID4gQEAgLTQ2LDcgKzQ2 LDYgQEANCj4gPiAgI2luY2x1ZGUgPGFzbS9hcGljLmg+DQo+ID4gICNlbmRpZg0KPiA+DQo+ID4g LSNpbmNsdWRlIDxhY3BpL2FjcGlfYnVzLmg+DQo+ID4gICNpbmNsdWRlIDxhY3BpL3Byb2Nlc3Nv ci5oPg0KPiANCj4gSXMgdGhlIHByb2Nlc3Nvci5oIGluY2x1c2lvbiBuZWNlc3NhcnkgaGVyZT8N Cj4gDQo+ID4NCj4gPiAgI2RlZmluZSBQUkVGSVggIkFDUEk6ICINCj4gPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9hY3BpL3Byb2Nlc3Nvcl9wZXJmbGliLmMgYi9kcml2ZXJzL2FjcGkvcHJvY2Vzc29y X3BlcmZsaWIuYw0KPiA+IGluZGV4IDYwYTdjMjguLmRmNjMzNzAgMTAwNjQ0DQo+ID4gLS0tIGEv ZHJpdmVycy9hY3BpL3Byb2Nlc3Nvcl9wZXJmbGliLmMNCj4gPiArKysgYi9kcml2ZXJzL2FjcGkv cHJvY2Vzc29yX3BlcmZsaWIuYw0KPiA+IEBAIC0zNiw4ICszNiw3IEBADQo+ID4gICNpbmNsdWRl IDxhc20vY3B1ZmVhdHVyZS5oPg0KPiA+ICAjZW5kaWYNCj4gPg0KPiA+IC0jaW5jbHVkZSA8YWNw aS9hY3BpX2J1cy5oPg0KPiA+IC0jaW5jbHVkZSA8YWNwaS9hY3BpX2RyaXZlcnMuaD4NCj4gPiAr I2luY2x1ZGUgPGxpbnV4L2FjcGkuaD4NCj4gPiAgI2luY2x1ZGUgPGFjcGkvcHJvY2Vzc29yLmg+ DQo+IA0KPiBBbmQgaGVyZT8gIEFuZCBpdCdzIGJldHRlciB0byBhZGQgI2luY2x1ZGUgPGxpbnV4 L2FjcGkuaD4gdG8gdGhlIG90aGVyICNpbmNsdWRlDQo+IDxsaW51eC8uLi4+IHRoaW5ncy4NCj4g DQo+ID4gICNkZWZpbmUgUFJFRklYICJBQ1BJOiAiDQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv YWNwaS9wcm9jZXNzb3JfdGhlcm1hbC5jIGIvZHJpdmVycy9hY3BpL3Byb2Nlc3Nvcl90aGVybWFs LmMNCj4gPiBpbmRleCBkMWQyZTdmLi40YWY4OWY5IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMv YWNwaS9wcm9jZXNzb3JfdGhlcm1hbC5jDQo+ID4gKysrIGIvZHJpdmVycy9hY3BpL3Byb2Nlc3Nv cl90aGVybWFsLmMNCj4gPiBAQCAtMzMsOSArMzMsOCBAQA0KPiA+DQo+ID4gICNpbmNsdWRlIDxh c20vdWFjY2Vzcy5oPg0KPiA+DQo+ID4gLSNpbmNsdWRlIDxhY3BpL2FjcGlfYnVzLmg+DQo+ID4g KyNpbmNsdWRlIDxsaW51eC9hY3BpLmg+DQo+ID4gICNpbmNsdWRlIDxhY3BpL3Byb2Nlc3Nvci5o Pg0KPiA+IC0jaW5jbHVkZSA8YWNwaS9hY3BpX2RyaXZlcnMuaD4NCj4gDQo+IFNhbWUgY29tbWVu dHMgYXMgYWJvdmUuDQo+IA0KPiA+ICAjZGVmaW5lIFBSRUZJWCAiQUNQSTogIg0KPiA+DQo+ID4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvYWNwaS9wcm9jZXNzb3JfdGhyb3R0bGluZy5jIGIvZHJpdmVy cy9hY3BpL3Byb2Nlc3Nvcl90aHJvdHRsaW5nLmMNCj4gPiBpbmRleCBlN2RkMmMxLi5hOWRlOTE5 IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvYWNwaS9wcm9jZXNzb3JfdGhyb3R0bGluZy5jDQo+ ID4gKysrIGIvZHJpdmVycy9hY3BpL3Byb2Nlc3Nvcl90aHJvdHRsaW5nLmMNCj4gPiBAQCAtMzYs OCArMzYsNyBAQA0KPiA+ICAjaW5jbHVkZSA8YXNtL2lvLmg+DQo+ID4gICNpbmNsdWRlIDxhc20v dWFjY2Vzcy5oPg0KPiA+DQo+ID4gLSNpbmNsdWRlIDxhY3BpL2FjcGlfYnVzLmg+DQo+ID4gLSNp bmNsdWRlIDxhY3BpL2FjcGlfZHJpdmVycy5oPg0KPiA+ICsjaW5jbHVkZSA8bGludXgvYWNwaS5o Pg0KPiA+ICAjaW5jbHVkZSA8YWNwaS9wcm9jZXNzb3IuaD4NCj4gDQo+IFNhbWUgY29tbWVudHMg YXMgYWJvdmUuDQo+IA0KPiA+ICAjZGVmaW5lIFBSRUZJWCAiQUNQSTogIg0KDQpbLi4uXQ0KDQo+ ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvYWNwaS9zY2FuLmMgYi9kcml2ZXJzL2FjcGkvc2Nhbi5j DQo+ID4gaW5kZXggZmQzOTQ1OS4uODg3MDI3NyAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL2Fj cGkvc2Nhbi5jDQo+ID4gKysrIGIvZHJpdmVycy9hY3BpL3NjYW4uYw0KPiA+IEBAIC0xMiw3ICsx Miw2IEBADQo+ID4gICNpbmNsdWRlIDxsaW51eC9kbWkuaD4NCj4gPiAgI2luY2x1ZGUgPGxpbnV4 L25scy5oPg0KPiA+DQo+ID4gLSNpbmNsdWRlIDxhY3BpL2FjcGlfZHJpdmVycy5oPg0KPiA+DQo+ IA0KPiBSZW1vdmUgdGhlIGVtcHR5IGxpbmUgdG9vLg0KPiANCj4gPiAgI2luY2x1ZGUgImludGVy bmFsLmgiDQo+ID4NCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9hY3BpL3NsZWVwLmMgYi9kcml2 ZXJzL2FjcGkvc2xlZXAuYw0KPiA+IGluZGV4IDcyMWU5NDkuLjI4MWU1ZmQgMTAwNjQ0DQo+ID4g LS0tIGEvZHJpdmVycy9hY3BpL3NsZWVwLmMNCj4gPiArKysgYi9kcml2ZXJzL2FjcGkvc2xlZXAu Yw0KPiA+IEBAIC0yMSw4ICsyMSw2IEBADQo+ID4NCj4gPiAgI2luY2x1ZGUgPGFzbS9pby5oPg0K PiA+DQo+ID4gLSNpbmNsdWRlIDxhY3BpL2FjcGlfYnVzLmg+DQo+ID4gLSNpbmNsdWRlIDxhY3Bp L2FjcGlfZHJpdmVycy5oPg0KPiA+DQo+IA0KPiBSZW1vdmUgdGhlIGVtcHR5IGxpbmUgdG9vLg0K PiANCj4gT0ssIHlvdSBzaG91bGQgZ2V0IHRoZSBpZGVhLiBQbGVhc2Uga2VlcCB0aGluZ3MgY29u c2lzdGVudCBhbmQgbmljZS4gOi0pDQoNClllcywgSSdsbCB0cnkgdG8gY292ZXIgYWxsIGFib3Zl IGNvbW1lbnRzIGluIDEgcGF0Y2guDQpUaGFua3MgZm9yIHRoZSBoZWxwaW5nLg0KDQpCZXN0IHJl Z2FyZHMNCi1Mdg0K -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c index 916ffe7..84715fc 100644 --- a/arch/ia64/hp/common/aml_nfw.c +++ b/arch/ia64/hp/common/aml_nfw.c @@ -23,8 +23,7 @@ */ #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/sal.h> MODULE_AUTHOR("Bjorn Helgaas <bjorn.helgaas@hp.com>"); diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c index 00c77cf..ccbf857 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -21,9 +21,7 @@ #include <asm/apic.h> #include <asm/ipi.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif +#include <linux/acpi.h> static struct apic apic_physflat; static struct apic apic_flat; diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index e63a5bd..4d67a75 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -37,9 +37,6 @@ #include <linux/kthread.h> #include <linux/jiffies.h> /* time_after() */ #include <linux/slab.h> -#ifdef CONFIG_ACPI -#include <acpi/acpi_bus.h> -#endif #include <linux/bootmem.h> #include <linux/dmar.h> #include <linux/hpet.h> diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 649a12b..08e350e 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -15,8 +15,7 @@ #include <linux/power_supply.h> #include <linux/olpc-ec.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/olpc.h> #define DRV_NAME "olpc-xo15-sci" diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 8711e37..8095943 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -32,8 +32,7 @@ #include <linux/delay.h> #include <linux/platform_device.h> #include <linux/power_supply.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c index a6869e1..2635a01 100644 --- a/drivers/acpi/acpi_extlog.c +++ b/drivers/acpi/acpi_extlog.c @@ -9,7 +9,6 @@ #include <linux/module.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/cper.h> #include <linux/ratelimit.h> #include <asm/cpu.h> diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index fc6008f..65610c0 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c @@ -28,8 +28,7 @@ #include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/mwait.h> #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index fbf1ace..e90ef8b 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -36,8 +36,7 @@ #include <linux/suspend.h> #include <asm/unaligned.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/power_supply.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 078c4f7..05ee8f6 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -30,7 +30,6 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/dmi.h> #include "internal.h" diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index bba9b72..cfea1c5 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -37,8 +37,6 @@ #include <asm/mpspec.h> #endif #include <linux/pci.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include <linux/dmi.h> #include <linux/suspend.h> diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index c971929..9e3a6cb 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -31,8 +31,7 @@ #include <linux/seq_file.h> #include <linux/input.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/button.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c index 12b62f2..c68e724 100644 --- a/drivers/acpi/custom_method.c +++ b/drivers/acpi/custom_method.c @@ -7,7 +7,7 @@ #include <linux/kernel.h> #include <linux/uaccess.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c index b55d6a2..6b1919f 100644 --- a/drivers/acpi/debugfs.c +++ b/drivers/acpi/debugfs.c @@ -5,7 +5,7 @@ #include <linux/export.h> #include <linux/init.h> #include <linux/debugfs.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME("debugfs"); diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index dcd73cc..9ab9e78 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -32,8 +32,6 @@ #include <linux/jiffies.h> #include <linux/stddef.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ba5b56d..1bd3de4 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -40,8 +40,7 @@ #include <linux/spinlock.h> #include <linux/slab.h> #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/dmi.h> #include "internal.h" diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index cae3b38..ef2d730 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/poll.h> #include <linux/gfp.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <net/netlink.h> #include <net/genetlink.h> diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index ba3da88..1fb6290 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -29,8 +29,7 @@ #include <linux/types.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c index 13b1d39..aafe3ca 100644 --- a/drivers/acpi/hed.c +++ b/drivers/acpi/hed.c @@ -25,8 +25,6 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/hed.h> static struct acpi_device_id acpi_hed_ids[] = { diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index a2343a1..9e6816e 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -29,7 +29,6 @@ #include <linux/errno.h> #include <linux/acpi.h> #include <linux/numa.h> -#include <acpi/acpi_bus.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 54a20ff..8507034 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -50,7 +50,6 @@ #include <asm/uaccess.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <acpi/processor.h> #include "internal.h" diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 41c5e1b..52d45ea 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -37,8 +37,6 @@ #include <linux/pci.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 2652a61..cc5feb9 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -40,8 +40,7 @@ #include <linux/mutex.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 20360e4..dadd0f50 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -35,8 +35,6 @@ #include <linux/pci-aspm.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/apei.h> #include "internal.h" diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index c2ad391..ad7da68 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -42,8 +42,7 @@ #include <linux/slab.h> #include <linux/pm_runtime.h> #include <linux/sysfs.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" #include "internal.h" diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 6a5b152..56d30fe 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c @@ -5,8 +5,7 @@ #include <linux/bcd.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "sleep.h" diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index b3171f3..ad88410 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -11,7 +11,7 @@ #include <linux/dmi.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include "internal.h" diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 644516d..a1087d8 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -46,7 +46,6 @@ #include <asm/apic.h> #endif -#include <acpi/acpi_bus.h> #include <acpi/processor.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 60a7c28..df63370 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -36,8 +36,7 @@ #include <asm/cpufeature.h> #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index d1d2e7f..4af89f9 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c @@ -33,9 +33,8 @@ #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <acpi/processor.h> -#include <acpi/acpi_drivers.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index e7dd2c1..a9de919 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c @@ -36,8 +36,7 @@ #include <asm/io.h> #include <asm/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index b78bc60..26e5b50 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c @@ -8,8 +8,7 @@ * the Free Software Foundation version 2. */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/wait.h> #include <linux/slab.h> #include <linux/delay.h> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index fd39459..8870277 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -12,7 +12,6 @@ #include <linux/dmi.h> #include <linux/nls.h> -#include <acpi/acpi_drivers.h> #include "internal.h" diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 721e949..281e5fd 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -21,8 +21,6 @@ #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" #include "sleep.h" diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index 6dbc3ca..443dc93 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c @@ -5,7 +5,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/moduleparam.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "internal.h" diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 0d9f46b..ee4e467 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -43,8 +43,7 @@ #include <linux/device.h> #include <asm/uaccess.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define PREFIX "ACPI: " diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 6d408bf..1336b91 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -30,8 +30,6 @@ #include <linux/types.h> #include <linux/hardirq.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include "internal.h" diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 995e91b..772ed29 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -39,8 +39,7 @@ #include <linux/slab.h> #include <asm/uaccess.h> #include <linux/dmi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/suspend.h> #include <acpi/video.h> diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c index 7bfbe40..1638401 100644 --- a/drivers/acpi/wakeup.c +++ b/drivers/acpi/wakeup.c @@ -5,7 +5,6 @@ #include <linux/init.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <linux/kernel.h> #include <linux/types.h> diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 4372cfa..8e3f8a7 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -20,7 +20,6 @@ #include <scsi/scsi_device.h> #include "libata.h" -#include <acpi/acpi_bus.h> unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644); diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index 73212c9..245609f 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c @@ -13,7 +13,7 @@ #include <linux/device.h> #include <linux/gfp.h> #include <scsi/scsi_host.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/libata.h> #include <linux/ata.h> diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 5d9c31d..1538402 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -40,7 +40,6 @@ #include <asm/div64.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/hpet.h> /* diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c index 2168d15..98a56c4 100644 --- a/drivers/char/tpm/tpm_ppi.c +++ b/drivers/char/tpm/tpm_ppi.c @@ -1,5 +1,4 @@ #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include "tpm.h" static const u8 tpm_ppi_uuid[] = { diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index dfff090..7fa3512 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c @@ -6,7 +6,6 @@ #include <linux/pci.h> #include <linux/acpi.h> #include <linux/vga_switcheroo.h> -#include <acpi/acpi_drivers.h> #include <drm/drmP.h> #include "i915_drv.h" diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 95c7404..6763865 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c @@ -1,8 +1,6 @@ #include <linux/pci.h> #include <linux/acpi.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> diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c index 98a9074..f97c34f 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c @@ -25,8 +25,6 @@ #include <linux/acpi.h> #include <linux/slab.h> #include <linux/power_supply.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> #include <acpi/video.h> #include <drm/drmP.h> diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 48aad4f..244d9a2 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -30,7 +30,6 @@ #include <linux/sysctl.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/completion.h> #include <linux/hyperv.h> #include <linux/kernel_stat.h> diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 8d40da3..a58a266 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -30,8 +30,7 @@ #include <linux/sched.h> #include <linux/time.h> #include <linux/err.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter" ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index dafc63c..9b64d26 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -18,8 +18,7 @@ #include <linux/err.h> #include <acpi/acpi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ATK_HID "ATK0110" diff --git a/drivers/input/misc/atlas_btns.c b/drivers/input/misc/atlas_btns.c index 5d44023..14833f7 100644 --- a/drivers/input/misc/atlas_btns.c +++ b/drivers/input/misc/atlas_btns.c @@ -29,7 +29,7 @@ #include <linux/input.h> #include <linux/types.h> #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define ACPI_ATLAS_NAME "Atlas ACPI" #define ACPI_ATLAS_CLASS "Atlas" diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index 0d64c41..9b2ccfd 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -31,7 +31,6 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/kernel.h> -#include <acpi/acpi_bus.h> #include <linux/sysfs.h> #include <linux/kobject.h> #include <asm/uaccess.h> diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 541bbe6..f773254 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -164,7 +164,6 @@ static inline const char *slot_name(struct slot *slot) #ifdef CONFIG_ACPI #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> void __init pciehp_acpi_slot_detection_init(void); diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index 50ce680..2122b2b 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c @@ -20,7 +20,6 @@ #include <linux/module.h> #include <linux/acpi.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> struct ioapic { acpi_handle handle; diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index f166126..d0e4999 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -13,7 +13,6 @@ #include <linux/module.h> #include <linux/pci-aspm.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> #include <linux/pci-acpi.h> #include <linux/pm_runtime.h> diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c index d51f45a..dbafcc8 100644 --- a/drivers/pci/pci-label.c +++ b/drivers/pci/pci-label.c @@ -29,7 +29,6 @@ #include <linux/nls.h> #include <linux/acpi.h> #include <linux/pci-acpi.h> -#include <acpi/acpi_bus.h> #include "pci.h" #define DEVICE_LABEL_DSM 0x07 diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index c9076bd..07eb2c4 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -42,7 +42,6 @@ #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <acpi/video.h> MODULE_AUTHOR("Carlos Corbacho"); diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 0e9c169..430b5c3 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -53,8 +53,7 @@ #include <linux/rfkill.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #define ASUS_LAPTOP_VERSION "0.42" diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 19c313b..df7ecb9 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -45,8 +45,7 @@ #include <linux/seq_file.h> #include <linux/platform_device.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/video.h> #include "asus-wmi.h" diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c index 6dfa8d3..0a16024 100644 --- a/drivers/platform/x86/classmate-laptop.c +++ b/drivers/platform/x86/classmate-laptop.c @@ -21,7 +21,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/workqueue.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/input.h> #include <linux/rfkill.h> diff --git a/drivers/platform/x86/dell-wmi-aio.c b/drivers/platform/x86/dell-wmi-aio.c index bcf8cc6..dbc97a3 100644 --- a/drivers/platform/x86/dell-wmi-aio.c +++ b/drivers/platform/x86/dell-wmi-aio.c @@ -24,7 +24,6 @@ #include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index fa9a217..bdf483b 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -32,7 +32,6 @@ #include <linux/types.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> -#include <acpi/acpi_drivers.h> #include <linux/acpi.h> #include <linux/string.h> #include <linux/dmi.h> diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index aefcc32..cabd567 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -28,8 +28,7 @@ #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include <linux/uaccess.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c index af67e6e..6112933 100644 --- a/drivers/platform/x86/eeepc-wmi.c +++ b/drivers/platform/x86/eeepc-wmi.c @@ -33,7 +33,7 @@ #include <linux/input/sparse-keymap.h> #include <linux/dmi.h> #include <linux/fb.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> #include "asus-wmi.h" diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c index a8e43cf..aff4d06 100644 --- a/drivers/platform/x86/hp_accel.c +++ b/drivers/platform/x86/hp_accel.c @@ -36,7 +36,7 @@ #include <linux/uaccess.h> #include <linux/leds.h> #include <linux/atomic.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include "../../misc/lis3lv02d/lis3lv02d.h" #define DRIVER_NAME "hp_accel" diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index 6788acc..70b5729 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -26,8 +26,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/rfkill.h> #include <linux/platform_device.h> #include <linux/input.h> diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel-rst.c index a2083a9..d45bca3 100644 --- a/drivers/platform/x86/intel-rst.c +++ b/drivers/platform/x86/intel-rst.c @@ -20,7 +20,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE("GPL"); diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c index 1838400..04cf5df 100644 --- a/drivers/platform/x86/intel-smartconnect.c +++ b/drivers/platform/x86/intel-smartconnect.c @@ -19,7 +19,7 @@ #include <linux/init.h> #include <linux/module.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_LICENSE("GPL"); diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index 11244f8..5d9ab07 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c @@ -38,8 +38,7 @@ #include <linux/pm.h> #include <linux/thermal.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR("Thomas Sujith"); MODULE_AUTHOR("Zhang Rui"); diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c index f6f18cd..8b0d020 100644 --- a/drivers/platform/x86/intel_oaktrail.c +++ b/drivers/platform/x86/intel_oaktrail.c @@ -50,8 +50,6 @@ #include <linux/platform_device.h> #include <linux/dmi.h> #include <linux/rfkill.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #define DRIVER_NAME "intel_oaktrail" diff --git a/drivers/platform/x86/mxm-wmi.c b/drivers/platform/x86/mxm-wmi.c index 0aea63b..3c59c0a 100644 --- a/drivers/platform/x86/mxm-wmi.c +++ b/drivers/platform/x86/mxm-wmi.c @@ -20,8 +20,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR("Dave Airlie"); MODULE_DESCRIPTION("MXM WMI Driver"); diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c index 10d12b2..d3c1782 100644 --- a/drivers/platform/x86/panasonic-laptop.c +++ b/drivers/platform/x86/panasonic-laptop.c @@ -125,8 +125,7 @@ #include <linux/seq_file.h> #include <linux/uaccess.h> #include <linux/slab.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/input.h> #include <linux/input/sparse-keymap.h> diff --git a/drivers/platform/x86/pvpanic.c b/drivers/platform/x86/pvpanic.c index 47ae0c4..c9f6e51 100644 --- a/drivers/platform/x86/pvpanic.c +++ b/drivers/platform/x86/pvpanic.c @@ -24,8 +24,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR("Hu Tao <hutao@cn.fujitsu.com>"); MODULE_DESCRIPTION("pvpanic device driver"); diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c index cae7098..5413f62 100644 --- a/drivers/platform/x86/samsung-q10.c +++ b/drivers/platform/x86/samsung-q10.c @@ -15,7 +15,7 @@ #include <linux/platform_device.h> #include <linux/backlight.h> #include <linux/dmi.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define SAMSUNGQ10_BL_MAX_INTENSITY 7 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 47caab0..c46f77a 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -61,8 +61,6 @@ #include <linux/workqueue.h> #include <linux/acpi.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/sony-laptop.h> diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index 9b93fdb..d16193e 100644 --- a/drivers/platform/x86/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c @@ -33,8 +33,7 @@ #include <linux/init.h> #include <linux/types.h> #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #define GUID "C364AC71-36DB-495A-8494-B439D472A505" diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 05e046a..1a773f3 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -84,7 +84,7 @@ #include <sound/control.h> #include <sound/initval.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/pci_ids.h> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 0cfadb6..886f600 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -57,7 +57,7 @@ #include <asm/uaccess.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR("John Belmonte"); MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver"); diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c index 74dd01a..6051963 100644 --- a/drivers/platform/x86/toshiba_bluetooth.c +++ b/drivers/platform/x86/toshiba_bluetooth.c @@ -23,8 +23,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@gmail.com>"); MODULE_DESCRIPTION("Toshiba Laptop ACPI Bluetooth Enable Driver"); diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 62e8c22..ba13ade 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -37,8 +37,6 @@ #include <linux/acpi.h> #include <linux/slab.h> #include <linux/module.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> ACPI_MODULE_NAME("wmi"); MODULE_AUTHOR("Carlos Corbacho"); diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c index 4b1377b..49cbcce 100644 --- a/drivers/platform/x86/xo15-ebook.c +++ b/drivers/platform/x86/xo15-ebook.c @@ -18,8 +18,7 @@ #include <linux/init.h> #include <linux/types.h> #include <linux/input.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #define MODULE_NAME "xo15-ebook" diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 14655a0..e869ba6 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -24,7 +24,6 @@ #include <linux/pnp.h> #include <linux/slab.h> #include <linux/mod_devicetable.h> -#include <acpi/acpi_bus.h> #include "../base.h" #include "pnpacpi.h" diff --git a/drivers/pnp/pnpacpi/pnpacpi.h b/drivers/pnp/pnpacpi/pnpacpi.h index 3e60225..051ef96 100644 --- a/drivers/pnp/pnpacpi/pnpacpi.h +++ b/drivers/pnp/pnpacpi/pnpacpi.h @@ -1,7 +1,6 @@ #ifndef ACPI_PNP_H #define ACPI_PNP_H -#include <acpi/acpi_bus.h> #include <linux/acpi.h> #include <linux/pnp.h> diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c index 9f6ebdb..a85c3d6 100644 --- a/drivers/staging/quickstart/quickstart.c +++ b/drivers/staging/quickstart/quickstart.c @@ -31,7 +31,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/types.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/input.h> diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 4e243c3..11c6569 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -16,7 +16,6 @@ #include <linux/acpi.h> #include <linux/pci.h> #include <linux/usb/hcd.h> -#include <acpi/acpi_bus.h> #include "usb.h" diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c index 8dae6c1..dbb6406 100644 --- a/drivers/xen/xen-acpi-cpuhotplug.c +++ b/drivers/xen/xen-acpi-cpuhotplug.c @@ -24,8 +24,6 @@ #include <linux/cpu.h> #include <linux/acpi.h> #include <linux/uaccess.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> #include <acpi/processor.h> #include <xen/acpi.h> diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c index 9083f1e..f2872a1 100644 --- a/drivers/xen/xen-acpi-memhotplug.c +++ b/drivers/xen/xen-acpi-memhotplug.c @@ -22,7 +22,6 @@ #include <linux/init.h> #include <linux/types.h> #include <linux/acpi.h> -#include <acpi/acpi_drivers.h> #include <xen/acpi.h> #include <xen/interface/platform.h> #include <asm/xen/hypercall.h> diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c index 59708fd..cd7b8ad 100644 --- a/drivers/xen/xen-acpi-pad.c +++ b/drivers/xen/xen-acpi-pad.c @@ -18,8 +18,7 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <asm/xen/hypercall.h> #include <xen/interface/version.h> #include <xen/xen-ops.h> diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c index 13bc6c3..29b096c 100644 --- a/drivers/xen/xen-acpi-processor.c +++ b/drivers/xen/xen-acpi-processor.c @@ -28,8 +28,7 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/syscore_ops.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> #include <acpi/processor.h> #include <xen/xen.h> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c602c77..0af9667 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -28,7 +28,6 @@ #include <linux/device.h> -#include <acpi/acpi.h> /* TBD: Make dynamic */ #define ACPI_MAX_HANDLES 10 diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 1cedfcb..f3f1219 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -26,8 +26,6 @@ #ifndef __ACPI_DRIVERS_H__ #define __ACPI_DRIVERS_H__ -#include <linux/acpi.h> -#include <acpi/acpi_bus.h> #define ACPI_MAX_STRING 80 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index 430dd96..71294ab 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h @@ -176,7 +176,7 @@ struct hotplug_params { #ifdef CONFIG_ACPI #include <acpi/acpi.h> -#include <acpi/acpi_bus.h> +#include <linux/acpi.h> 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_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle); diff --git a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c index 66cace6..eafd851 100644 --- a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +++ b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c @@ -28,8 +28,7 @@ #include <asm/io.h> -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h> static int pm_tmr_ioport = 0;