linux/include/acpi
Lv Zheng 78e25fef27 ACPICA: Fix divergences of definition conflicts.
There are conflicts in the "acpi_device_id*" definitions between the
Linux and the ACPICA.  The definitions of acpi_device_id* in ACPICA
have been changed to the "acpi_pnp_device_id*".  This patch changes
the corresponding "acpica_device_id*" definitiions in the Linux.

This patch will not affect the generated vmlinx binary.
This will decrease 298 lines of 20120913 divergence.diff.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2012-11-15 00:31:22 +01:00
..
platform UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
acbuffer.h ACPICA: Add struct header support for _FDE, _GRT, _GTM, and _SRT names. 2012-09-21 00:26:17 -04:00
acconfig.h ACPICA: Fix unmerged debugger divergences. 2012-11-15 00:31:22 +01:00
acexcep.h ACPICA: Update header files copyrights to 2012 2012-07-17 00:05:50 -04:00
acnames.h ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
acoutput.h ACPICA: Update header files copyrights to 2012 2012-07-17 00:05:50 -04:00
acpi_bus.h Merge branches 'acpica', 'acpidump', 'intel-idle', 'misc', 'module_acpi_driver-simplify', 'turbostat' and 'usb3' into release 2012-10-06 16:00:32 -04:00
acpi_drivers.h ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning 2011-11-06 20:58:17 -05:00
acpi_numa.h ACPI: Store SRAT table revision 2012-01-17 04:19:04 -05:00
acpi.h UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
acpiosxf.h UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
acpixf.h Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2012-10-08 07:14:06 +09:00
acrestyp.h ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
actbl1.h ACPICA: Headers: Add new ACPI 5 HEST notify type values. 2012-09-21 00:34:57 -04:00
actbl2.h ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
actbl3.h ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
actbl.h ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
actypes.h ACPICA: Fix divergences of definition conflicts. 2012-11-15 00:31:22 +01:00
apei.h module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
button.h ACPI: make ACPI button funcs no-ops if not built in 2009-09-17 14:48:23 -07:00
container.h
hed.h ACPI Hardware Error Device (PNP0C33) support 2010-05-19 22:40:24 -04:00
pdc_intel.h ACPI: Enable bit 11 in _PDC to advertise hw coord 2009-02-07 00:41:14 -05:00
processor.h cpuidle / ACPI : move cpuidle_device field out of the acpi_processor_power structure 2012-09-17 23:01:56 +02:00
reboot.h Add the ability to reset the machine using the RESET_REG in ACPI's FADT table. 2008-07-16 23:27:08 +02:00
video.h i915: Fix opregion notifications 2011-07-13 11:19:47 -07:00