Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
48c906823f
linux/include/acpi
History
Linus Torvalds dc7c65db28 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (72 commits)
  Revert "x86/PCI: ACPI based PCI gap calculation"
  PCI: remove unnecessary volatile in PCIe hotplug struct controller
  x86/PCI: ACPI based PCI gap calculation
  PCI: include linux/pm_wakeup.h for device_set_wakeup_capable
  PCI PM: Fix pci_prepare_to_sleep
  x86/PCI: Fix PCI config space for domains > 0
  Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n
  PCI: Simplify PCI device PM code
  PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep
  PCI ACPI: Rework PCI handling of wake-up
  ACPI: Introduce new device wakeup flag 'prepared'
  ACPI: Introduce acpi_device_sleep_wake function
  PCI: rework pci_set_power_state function to call platform first
  PCI: Introduce platform_pci_power_manageable function
  ACPI: Introduce acpi_bus_power_manageable function
  PCI: make pci_name use dev_name
  PCI: handle pci_name() being const
  PCI: add stub for pci_set_consistent_dma_mask()
  PCI: remove unused arch pcibios_update_resource() functions
  PCI: fix pci_setup_device()'s sprinting into a const buffer
  ...

Fixed up conflicts in various files (arch/x86/kernel/setup_64.c,
arch/x86/pci/irq.c, arch/x86/pci/pci.h, drivers/acpi/sleep/main.c,
drivers/pci/pci.c, drivers/pci/pci.h, include/acpi/acpi_bus.h) from x86
and ACPI updates manually.
2008-07-16 17:25:46 -07:00
..
platform ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acconfig.h ACPICA: Update version to 20080609 2008-07-16 23:27:04 +02:00
acdebug.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acdisasm.h ACPICA: Update disassembler for DMAR table changes 2008-07-16 23:27:04 +02:00
acdispat.h ACPICA: Eliminate acpi_native_uint type v2 2008-07-16 23:27:03 +02:00
acevents.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acexcep.h ACPICA: Fix possible negative array index in acpi_ut_validate_exception 2008-07-16 23:27:03 +02:00
acglobal.h ACPICA: Eliminate acpi_native_uint type v2 2008-07-16 23:27:03 +02:00
achware.h ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space 2008-07-16 23:27:04 +02:00
acinterp.h ACPICA: Cleanup debug operand dump mechanism 2008-07-16 23:27:04 +02:00
aclocal.h ACPICA: Add const qualifier for appropriate string constants 2008-07-16 23:27:04 +02:00
acmacros.h ACPICA: Cleanup debug operand dump mechanism 2008-07-16 23:27:04 +02:00
acnames.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acnamesp.h ACPICA: Add const qualifier for appropriate string constants 2008-07-16 23:27:04 +02:00
acobject.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acopcode.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acoutput.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acparser.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acpi_bus.h ACPI PM: acpi_pm_device_sleep_state() cleanup 2008-07-16 23:27:02 +02:00
acpi_drivers.h ACPI: Introduce acpi_device_sleep_wake function 2008-07-07 16:25:57 -07:00
acpi_numa.h ACPI: misc cleanups 2008-02-07 03:33:23 -05:00
acpi.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acpiosxf.h ACPICA: Eliminate acpi_native_uint type v2 2008-07-16 23:27:03 +02:00
acpixf.h ACPI: Enhance /sys/firmware/interrupts to allow enable/disable/clear from user-space 2008-07-16 23:27:04 +02:00
acresrc.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
acstruct.h ACPICA: Eliminate acpi_native_uint type v2 2008-07-16 23:27:03 +02:00
actables.h ACPICA: Eliminate acpi_native_uint type v2 2008-07-16 23:27:03 +02:00
actbl1.h ACPICA: Update disassembler for DMAR table changes 2008-07-16 23:27:04 +02:00
actbl.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
actypes.h ACPICA: Eliminate acpi_native_uint type v2 2008-07-16 23:27:03 +02:00
acutils.h ACPICA: Add const qualifier for appropriate string constants 2008-07-16 23:27:04 +02:00
amlcode.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
amlresrc.h ACPICA: update Intel copyright 2008-04-23 23:00:13 -04:00
container.h [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
pdc_intel.h ACPI: Processor native C-states using MWAIT 2006-10-14 00:35:39 -04:00
processor.h ACPI: change processors from array to per_cpu variable 2008-07-16 23:27:01 +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