diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 12:50:33 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 12:50:33 -0500 |
| commit | c2d8c259bfce056437e8dbc4b048944050f9b567 (patch) | |
| tree | 726e49653f7014bea034c59624ea23c21d6df13f /arch/arm/mach-omap2/pm.h | |
| parent | e4de6c961cc8b688443c7989ae3e38d0518334a5 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge branch 'devel/debug_ll_init' into next/multiplatform
* devel/debug_ll_init:
ARM: implement debug_ll_io_init()
+ sync to Linux 3.7-rc4
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 686137d164da..67d66131cfa7 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h | |||
| @@ -91,6 +91,7 @@ extern void omap3_save_scratchpad_contents(void); | |||
| 91 | 91 | ||
| 92 | #define PM_RTA_ERRATUM_i608 (1 << 0) | 92 | #define PM_RTA_ERRATUM_i608 (1 << 0) |
| 93 | #define PM_SDRC_WAKEUP_ERRATUM_i583 (1 << 1) | 93 | #define PM_SDRC_WAKEUP_ERRATUM_i583 (1 << 1) |
| 94 | #define PM_PER_MEMORIES_ERRATUM_i582 (1 << 2) | ||
| 94 | 95 | ||
| 95 | #if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) | 96 | #if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) |
| 96 | extern u16 pm34xx_errata; | 97 | extern u16 pm34xx_errata; |