diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-19 14:38:23 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-19 14:38:23 +1100 |
| commit | 87d31345c0a90ccdf185feed9923ed14764f45dc (patch) | |
| tree | 2816764e59f93379e0e3843fa0c417aafe02c503 /arch/powerpc/include/asm/mpc52xx_psc.h | |
| parent | e98efaf303ccbff11522a054d155593d7f2bb41f (diff) | |
| parent | d24720a45ad2928f687c6371482cdfba19b74fc5 (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/include/asm/mpc52xx_psc.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpc52xx_psc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpc52xx_psc.h b/arch/powerpc/include/asm/mpc52xx_psc.h index fb841205745..42561f4f032 100644 --- a/arch/powerpc/include/asm/mpc52xx_psc.h +++ b/arch/powerpc/include/asm/mpc52xx_psc.h @@ -25,7 +25,11 @@ #include <asm/types.h> /* Max number of PSCs */ +#ifdef CONFIG_PPC_MPC512x +#define MPC52xx_PSC_MAXNUM 12 +#else #define MPC52xx_PSC_MAXNUM 6 +#endif /* Programmable Serial Controller (PSC) status register bits */ #define MPC52xx_PSC_SR_UNEX_RX 0x0001 |