diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2006-12-01 12:09:33 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2006-12-01 12:09:33 +0800 |
| commit | e0b369e4f71b11dd5716903dd6258028cf07e6e8 (patch) | |
| tree | 615986f2b3088072c49d74e1086650e185087698 /include/74xx_7xx.h | |
| parent | ee311214e0d216f904feea269599d0934bf71f23 (diff) | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
| download | blackbird-obmc-uboot-e0b369e4f71b11dd5716903dd6258028cf07e6e8.tar.gz blackbird-obmc-uboot-e0b369e4f71b11dd5716903dd6258028cf07e6e8.zip | |
Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.
Merge branch 'master' into hpc2
Conflicts:
MAKEALL
cpu/74xx_7xx/cpu.c
cpu/74xx_7xx/cpu_init.c
cpu/74xx_7xx/speed.c
Diffstat (limited to 'include/74xx_7xx.h')
| -rw-r--r-- | include/74xx_7xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/74xx_7xx.h b/include/74xx_7xx.h index 7cd2f10b01..8eccac8d59 100644 --- a/include/74xx_7xx.h +++ b/include/74xx_7xx.h @@ -111,6 +111,7 @@ typedef enum __cpu_t { CPU_750CX, CPU_750FX, CPU_750GX, CPU_7400, CPU_7410, + CPU_7448, CPU_7450, CPU_7455, CPU_7457, CPU_7447A, CPU_7448, CPU_UNKNOWN} cpu_t; |
