]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "usb: Register usb port's acpi power resources"
authorLan Tianyu <tianyu.lan@intel.com>
Mon, 28 Jan 2013 16:59:06 +0000 (00:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Jan 2013 15:33:07 +0000 (07:33 -0800)
commit3fa9ad307cd16c2c4d8f5ac00df7c13105a27212
treeb92ed97ffde1665a6a20c0d1314dd8c981abb216
parent78e98ca3f8b66c2b875fb0e226d637cc44019587
Revert "usb: Register usb port's acpi power resources"

This reverts commit 89304458e407a0c96877e388f3f7f3aee87d5b25.

The linux-next branch of linux-pm tree has replaced
acpi_power_resource_(un)register_device() with new routines.
Commit 8930445 will cause conflict in the linux-next tree.
So revert it and this will not affect other functions. Will
send a new patch with new routines after 3.9 merge window.

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/port.c
drivers/usb/core/usb-acpi.c
drivers/usb/core/usb.h