diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-16 14:51:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-16 14:51:20 -0400 |
| commit | cddb783552f51b5e39fc2db3a34d150d753758e4 (patch) | |
| tree | c16ad1a9336d20200cf219954f1169dfae4aa84b /arch/arm/mach-omap2/prm-regbits-34xx.h | |
| parent | b477dfba38bd54c47ea1fe128e2fa778ede1b2f5 (diff) | |
| parent | 005187eecaa400b4b43d9f640fbde9fcc50f37c1 (diff) | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap2/prm-regbits-34xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/prm-regbits-34xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h index c6a7940f4287..9fd03a2ec95c 100644 --- a/arch/arm/mach-omap2/prm-regbits-34xx.h +++ b/arch/arm/mach-omap2/prm-regbits-34xx.h | |||
| @@ -409,7 +409,7 @@ | |||
| 409 | /* PM_PREPWSTST_CAM specific bits */ | 409 | /* PM_PREPWSTST_CAM specific bits */ |
| 410 | 410 | ||
| 411 | /* PM_PWSTCTRL_USBHOST specific bits */ | 411 | /* PM_PWSTCTRL_USBHOST specific bits */ |
| 412 | #define OMAP3430ES2_SAVEANDRESTORE_SHIFT (1 << 4) | 412 | #define OMAP3430ES2_SAVEANDRESTORE_SHIFT 4 |
| 413 | 413 | ||
| 414 | /* RM_RSTST_PER specific bits */ | 414 | /* RM_RSTST_PER specific bits */ |
| 415 | 415 | ||