diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-ppc/mpc8xx.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-ppc/mpc8xx.h')
| -rw-r--r-- | include/asm-ppc/mpc8xx.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index 46f159cf589e..3515a7fa6c89 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h | |||
| @@ -111,8 +111,11 @@ enum ppc_sys_devices { | |||
| 111 | MPC8xx_CPM_SMC1, | 111 | MPC8xx_CPM_SMC1, |
| 112 | MPC8xx_CPM_SMC2, | 112 | MPC8xx_CPM_SMC2, |
| 113 | MPC8xx_CPM_USB, | 113 | MPC8xx_CPM_USB, |
| 114 | NUM_PPC_SYS_DEVS, | ||
| 114 | }; | 115 | }; |
| 115 | 116 | ||
| 117 | #define PPC_PIN_SIZE (24 * 1024 * 1024) /* 24Mbytes of data pinned */ | ||
| 118 | |||
| 116 | #ifndef BOARD_CHIP_NAME | 119 | #ifndef BOARD_CHIP_NAME |
| 117 | #define BOARD_CHIP_NAME "" | 120 | #define BOARD_CHIP_NAME "" |
| 118 | #endif | 121 | #endif |