diff options
| author |   Lan Tianyu <tianyu.lan@intel.com> | 2013-01-29 00:59:06 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-29 07:33:07 -0800 |
| commit | 3b2ab2b84c68fb92accbc735927bc8221e4de973 (patch) | |
| tree | b92ed97ffde1665a6a20c0d1314dd8c981abb216 /include/linux/debugobjects.h | |
| parent | Merge 3.8-rc5 into usb-next (diff) | |
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>
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions