diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-15 07:58:30 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-15 07:58:30 -0500 |
| commit | e8f71df723339b6d3861886f58c245812d1994f8 (patch) | |
| tree | 77264d37afeff152816afa1fea7b960dc8cbbd1e /arch | |
| parent | b34bf8e3cd5039ccba7f478601188427b1a8cd0b (diff) | |
| parent | 3757b94802fb65d8f696597a74053cf21738da0b (diff) | |
Merge branch 'acpi-cleanup'
* acpi-cleanup: (21 commits)
ACPI / hotplug: Fix concurrency issues and memory leaks
ACPI: Remove the use of CONFIG_ACPI_CONTAINER_MODULE
ACPI / scan: Full transition to D3cold in acpi_device_unregister()
ACPI / scan: Make acpi_bus_hot_remove_device() acquire the scan lock
ACPI: Drop the container.h header file
ACPI / Documentation: refer to correct file for acpi_platform_device_ids[] table
ACPI / scan: Make container driver use struct acpi_scan_handler
ACPI / scan: Remove useless #ifndef from acpi_eject_store()
ACPI: Unbind ACPI drv when probe failed
ACPI: sysfs eject support for ACPI scan handlers
ACPI / scan: Follow priorities of IDs when matching scan handlers
ACPI / PCI: pci_slot: replace printk(KERN_xxx) with pr_xxx()
ACPI / dock: Fix acpi_bus_get_device() check in drivers/acpi/dock.c
ACPI / scan: Clean up acpi_bus_get_parent()
ACPI / platform: Use struct acpi_scan_handler for creating devices
ACPI / PCI: Make PCI IRQ link driver use struct acpi_scan_handler
ACPI / PCI: Make PCI root driver use struct acpi_scan_handler
ACPI / scan: Introduce struct acpi_scan_handler
ACPI / scan: Make scanning of fixed devices follow the general scheme
ACPI: Drop device start operation that is not used
...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/hp/common/aml_nfw.c | 2 | ||||
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo15-sci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/hp/common/aml_nfw.c b/arch/ia64/hp/common/aml_nfw.c index 6192f7188654..916ffe770bcf 100644 --- a/arch/ia64/hp/common/aml_nfw.c +++ b/arch/ia64/hp/common/aml_nfw.c | |||
| @@ -191,7 +191,7 @@ static int aml_nfw_add(struct acpi_device *device) | |||
| 191 | return aml_nfw_add_global_handler(); | 191 | return aml_nfw_add_global_handler(); |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | static int aml_nfw_remove(struct acpi_device *device, int type) | 194 | static int aml_nfw_remove(struct acpi_device *device) |
| 195 | { | 195 | { |
| 196 | return aml_nfw_remove_global_handler(); | 196 | return aml_nfw_remove_global_handler(); |
| 197 | } | 197 | } |
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 2fdca25905ae..fef7d0ba7e3a 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c | |||
| @@ -195,7 +195,7 @@ err_sysfs: | |||
| 195 | return r; | 195 | return r; |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | static int xo15_sci_remove(struct acpi_device *device, int type) | 198 | static int xo15_sci_remove(struct acpi_device *device) |
| 199 | { | 199 | { |
| 200 | acpi_disable_gpe(NULL, xo15_sci_gpe); | 200 | acpi_disable_gpe(NULL, xo15_sci_gpe); |
| 201 | acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler); | 201 | acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler); |