diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 07:26:35 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 07:26:35 (GMT) |
commit | feee830394cab4e697d2204da6d10a606619de3d (patch) | |
tree | f2ba451f9ea9f05b21d0df9a4237bd01b711bcfc /arch/mips/power/hibernate.S | |
parent | e0f8d323f34dee3f47388dc3d87e7c428b077a0d (diff) | |
parent | 689557d3c7045320958d5bc4141088f7b4dff7ba (diff) | |
download | linux-fsl-qoriq-feee830394cab4e697d2204da6d10a606619de3d.tar.xz |
Merge tag 'extcon-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes:
This is patch set of extcon for v3.9.
Update to max77693/max8997 extcon driver:
- Using MHL_TA cable for charging.
- Support JIG cable.
- Support Dock-Audio device for playing music and button of device.
- Support Dock-Smart device for desktop mode with mouse/keyboard.
- Set default UART/USB path on probe().
- Check the state/type of cable after completing initialization.
- Code clean to remove duplicate code and bug fix related to sequence of interrupt.
- Fix irq_flag of max8997/max77693 driver.
Update to arizona extcon driver:
- Headphone measurements.
- Alternative detection mechanism for non-default system designs.
- Microphone clamp integration.
- Support for additional detection pin.
- MICBIAS rise time configuration.
Diffstat (limited to 'arch/mips/power/hibernate.S')
-rw-r--r-- | arch/mips/power/hibernate.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S index f8a751c..61e2558 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S @@ -8,7 +8,6 @@ * Wu Zhangjin <wuzhangjin@gmail.com> */ #include <asm/asm-offsets.h> -#include <asm/page.h> #include <asm/regdef.h> #include <asm/asm.h> @@ -35,7 +34,7 @@ LEAF(swsusp_arch_resume) 0: PTR_L t1, PBE_ADDRESS(t0) /* source */ PTR_L t2, PBE_ORIG_ADDRESS(t0) /* destination */ - PTR_ADDU t3, t1, PAGE_SIZE + PTR_ADDU t3, t1, _PAGE_SIZE 1: REG_L t8, (t1) REG_S t8, (t2) |