diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 17:27:43 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 17:27:43 -0600 |
| commit | 4fb85d35bcec842e0f20437aea277157973aa45f (patch) | |
| tree | d3b865af2f4066f68828806b231e4bb5b4de9ec8 /arch/arm/mach-omap2/control.h | |
| parent | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (diff) | |
| parent | a86c0b9867940bd0ba78f109686079b4051a463d (diff) | |
Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
Conflicts:
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
arch/arm/mach-omap2/clkt_clksel.c
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/mach-omap2/control.h')
| -rw-r--r-- | arch/arm/mach-omap2/control.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h index c1a5cab0f236..5594b42372ee 100644 --- a/arch/arm/mach-omap2/control.h +++ b/arch/arm/mach-omap2/control.h @@ -354,6 +354,7 @@ /* AM33XX CONTROL_STATUS bitfields (partial) */ #define AM33XX_CONTROL_STATUS_SYSBOOT1_SHIFT 22 +#define AM33XX_CONTROL_STATUS_SYSBOOT1_WIDTH 0x2 #define AM33XX_CONTROL_STATUS_SYSBOOT1_MASK (0x3 << 22) /* CONTROL OMAP STATUS register to identify OMAP3 features */ |