Fix the confilcts when merging 'master' into hpc2.

[u-boot] / include / 74xx_7xx.h

diff --git a/include/74xx_7xx.h b/include/74xx_7xx.h
index 33e396a066c8ad0387f07a48d0ef9eccf91012df..8eccac8d592405182a63dbe127b15fb3a2531094 100644 (file)
--- a/include/74xx_7xx.h
+++ b/include/74xx_7xx.h
@@ -113,6 +113,7 @@ typedef enum __cpu_t {
        CPU_7410,
        CPU_7448,
        CPU_7450, CPU_7455, CPU_7457,
+       CPU_7447A, CPU_7448,
        CPU_UNKNOWN} cpu_t;
 
 extern cpu_t get_cpu_type(void);