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)
commit3b2ab2b84c68fb92accbc735927bc8221e4de973
treeb92ed97ffde1665a6a20c0d1314dd8c981abb216
parent67635d397a643514fdfa859f611b86bd3ad8958d
Revert "usb: Register usb port's acpi power resources"

This reverts commit 88bb965ed711e8a5984e70208ebc901a6ff4141f.

The linux-next branch of linux-pm tree has replaced
acpi_power_resource_(un)register_device() with new routines.
Commit 88bb965 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