Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / powerpc / include / asm / u-boot.h

diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h
index f17b146da3b3f896a2e498031a0ddc511ad9b160..5916f7ce99ec578e4e3bf92c8fd4cbe05a8ca99e 100644 (file)
--- a/arch/powerpc/include/asm/u-boot.h
+++ b/arch/powerpc/include/asm/u-boot.h
@@ -67,7 +67,6 @@ typedef struct bd_info {
        unsigned int    bi_baudrate;    /* Console Baudrate */
 #if defined(CONFIG_405)   || \
     defined(CONFIG_405GP) || \
-    defined(CONFIG_405CR) || \
     defined(CONFIG_405EP) || \
     defined(CONFIG_405EZ) || \
     defined(CONFIG_405EX) || \