Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source
  ACPI: quiet ACPI Exceptions due to no _PTC or _TSS
  ACPI: Remove references to ACPI_STATE_S2 from acpi_pm_enter
  ACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86
  ACPI: Kconfig: fold /proc/acpi/sleep under CONFIG_ACPI_PROCFS
  ACPI: Kconfig: CONFIG_ACPI_PROCFS now defaults to N
  ACPI: autoload modules - Create __mod_acpi_device_table symbol for all ACPI drivers
  ACPI: autoload modules - Create ACPI alias interface
  ACPI: autoload modules - ACPICA modifications
  ACPI: asus-laptop: Fix failure exits
  ACPI: fix oops due to typo in new throttling code
  ACPI: ignore _PSx method for hotplugable PCI devices
  ACPI: Use ACPI methods to select PCI device suspend state
  ACPI, PNP: hook ACPI D-state to PNP suspend/resume
  ACPI: Add acpi_pm_device_sleep_state helper routine
  ACPI: Implement the set_target() callback from pm_ops

diff --combined drivers/pci/pci.c
index c954853,1458fd6..fba319d
--- 1/drivers/pci/pci.c
--- 2/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -499,7 -499,7 +499,7 @@@ pci_set_power_state(struct pci_dev *dev
        return 0;
  }
  
- int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
+ pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
   
  /**
   * pci_choose_state - Choose the power state of a PCI device
@@@ -513,15 -513,15 +513,15 @@@
  
  pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
  {
-       int ret;
+       pci_power_t ret;
  
        if (!pci_find_capability(dev, PCI_CAP_ID_PM))
                return PCI_D0;
  
        if (platform_pci_choose_state) {
                ret = platform_pci_choose_state(dev, state);
-               if (ret >= 0)
-                       state.event = ret;
+               if (ret != PCI_POWER_ERROR)
+                       return ret;
        }
  
        switch (state.event) {
@@@ -1604,7 -1604,6 +1604,7 @@@ early_param("pci", pci_setup)
  device_initcall(pci_init);
  
  EXPORT_SYMBOL_GPL(pci_restore_bars);
 +EXPORT_SYMBOL(__pci_reenable_device);
  EXPORT_SYMBOL(pci_enable_device_bars);
  EXPORT_SYMBOL(pci_enable_device);
  EXPORT_SYMBOL(pcim_enable_device);

diff --combined drivers/pci/pci.h
index 7b696cd,c293ba1..c6e132d
--- 1/drivers/pci/pci.h
--- 2/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -1,5 -1,6 +1,5 @@@
  /* Functions internal to the PCI core code */
  
 -extern int __must_check __pci_reenable_device(struct pci_dev *);
  extern int pci_uevent(struct device *dev, char **envp, int num_envp,
                      char *buffer, int buffer_size);
  extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
@@@ -12,7 -13,7 +12,7 @@@ extern int pci_bus_alloc_resource(struc
                                              resource_size_t, resource_size_t),
                                  void *alignf_data);
  /* Firmware callbacks */
- extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
+ extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
  extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state);
  
  extern int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val);