diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 01:51:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 01:51:27 +0200 |
| commit | 8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e (patch) | |
| tree | 88cd7852d59ebae54fcc2f57019ea13284042962 /arch/arm/mach-omap2/cm-regbits-34xx.h | |
| parent | driver-core: Shut up dev_dbg_reatelimited() without DEBUG (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.tar.xz linux-8f949b9a7e0bac3a9c3c29dc27c476a87e21db3e.zip | |
Merge 3.6-rc7 into driver-core-next
This pulls in the fixes in that branch that are needed here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-omap2/cm-regbits-34xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/cm-regbits-34xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h index 766338fe4d34..975f6bda0e0b 100644 --- a/arch/arm/mach-omap2/cm-regbits-34xx.h +++ b/arch/arm/mach-omap2/cm-regbits-34xx.h @@ -67,6 +67,7 @@ #define OMAP3430_EN_IVA2_DPLL_MASK (0x7 << 0) /* CM_IDLEST_IVA2 */ +#define OMAP3430_ST_IVA2_SHIFT 0 #define OMAP3430_ST_IVA2_MASK (1 << 0) /* CM_IDLEST_PLL_IVA2 */ |