diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-25 15:25:39 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-25 15:25:39 +1100 |
| commit | 56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch) | |
| tree | fc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/include | |
| parent | e075cd7001634c9984950488d9201fcf896dca27 (diff) | |
| parent | 8e18862d52b8ecd62354dad117aff22391b2c4e5 (diff) | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_lbc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 8a0b5ece8f7..420b45368fc 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -238,8 +238,6 @@ struct fsl_lbc_regs { #define FPAR_LP_CI_SHIFT 0 __be32 fbcr; /**< Flash Byte Count Register */ #define FBCR_BC 0x00000FFF - u8 res11[0x8]; - u8 res8[0xF00]; }; /* @@ -294,6 +292,11 @@ struct fsl_lbc_ctrl { /* status read from LTESR by irq handler */ unsigned int irq_status; + +#ifdef CONFIG_SUSPEND + /* save regs when system go to deep-sleep */ + struct fsl_lbc_regs *saved_regs; +#endif }; extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, |