diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:17:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:17:30 -0700 |
| commit | 45acab01ca6389371ec39e16844768a60f5f1380 (patch) | |
| tree | c2997deab16bdc254f927edfa849d2a4dfb36092 /arch/powerpc/include/asm/fsl_lbc.h | |
| parent | c0880dcded3ffe77700184e9d96c110ce0094c11 (diff) | |
| parent | 9693ebd4815eefa2b7c8fcc699061a0c8da0c1e7 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/fsl_rio: Error interrupt handler for sRIO on MPC85xx
powerpc/fsl_rio: move machine_check handler
powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum
Diffstat (limited to 'arch/powerpc/include/asm/fsl_lbc.h')
| -rw-r--r-- | arch/powerpc/include/asm/fsl_lbc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index 5c1bf3466749..8a0b5ece8f76 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -157,6 +157,8 @@ struct fsl_lbc_regs { #define LBCR_EPAR_SHIFT 16 #define LBCR_BMT 0x0000FF00 #define LBCR_BMT_SHIFT 8 +#define LBCR_BMTPS 0x0000000F +#define LBCR_BMTPS_SHIFT 0 #define LBCR_INIT 0x00040000 __be32 lcrr; /**< Clock Ratio Register */ #define LCRR_DBYP 0x80000000 |