Fix the confilcts when merging 'master' into hpc2.

[people/ms/u-boot.git] / include / 74xx_7xx.h

diff --git a/include/74xx_7xx.h b/include/74xx_7xx.h
index 7cd2f10b018760a9e77f3a3b8c517be933575849..8eccac8d592405182a63dbe127b15fb3a2531094 100644 (file)
--- 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;