From 32ec497e53b4eb16c6d6fe312c69f3a0fab20560 Mon Sep 17 00:00:00 2001 From: Cliff Cai Date: Fri, 21 Dec 2007 21:04:40 +0800 Subject: [PATCH] --- yaml --- r: 77363 b: refs/heads/master c: a5bb85dfffd38714d83cf7798886462d7314b90a h: refs/heads/master i: 77361: 3fdaefd776127bf259fde22790b5dddb8ba33e77 77359: cde594a9baf3d4ef62976dca35327549a3e3bba0 v: v3 --- [refs] | 2 +- trunk/include/asm-blackfin/mach-bf548/defBF542.h | 4 ++-- trunk/include/asm-blackfin/mach-bf548/defBF548.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8bad7e74d7ec..5ac11d9d22a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb96c56de33def1484614c6a3d0fbef76595ce2f +refs/heads/master: a5bb85dfffd38714d83cf7798886462d7314b90a diff --git a/trunk/include/asm-blackfin/mach-bf548/defBF542.h b/trunk/include/asm-blackfin/mach-bf548/defBF542.h index 32d07130200c..a7c809f29ede 100644 --- a/trunk/include/asm-blackfin/mach-bf548/defBF542.h +++ b/trunk/include/asm-blackfin/mach-bf548/defBF542.h @@ -432,8 +432,8 @@ #define CMD_CRC_FAIL 0x1 /* CMD CRC Fail */ #define DAT_CRC_FAIL 0x2 /* Data CRC Fail */ -#define CMD_TIMEOUT 0x4 /* CMD Time Out */ -#define DAT_TIMEOUT 0x8 /* Data Time Out */ +#define CMD_TIME_OUT 0x4 /* CMD Time Out */ +#define DAT_TIME_OUT 0x8 /* Data Time Out */ #define TX_UNDERRUN 0x10 /* Transmit Underrun */ #define RX_OVERRUN 0x20 /* Receive Overrun */ #define CMD_RESP_END 0x40 /* CMD Response End */ diff --git a/trunk/include/asm-blackfin/mach-bf548/defBF548.h b/trunk/include/asm-blackfin/mach-bf548/defBF548.h index ecbca952985c..e46f56891e6a 100644 --- a/trunk/include/asm-blackfin/mach-bf548/defBF548.h +++ b/trunk/include/asm-blackfin/mach-bf548/defBF548.h @@ -1095,8 +1095,8 @@ #define CMD_CRC_FAIL 0x1 /* CMD CRC Fail */ #define DAT_CRC_FAIL 0x2 /* Data CRC Fail */ -#define CMD_TIMEOUT 0x4 /* CMD Time Out */ -#define DAT_TIMEOUT 0x8 /* Data Time Out */ +#define CMD_TIME_OUT 0x4 /* CMD Time Out */ +#define DAT_TIME_OUT 0x8 /* Data Time Out */ #define TX_UNDERRUN 0x10 /* Transmit Underrun */ #define RX_OVERRUN 0x20 /* Receive Overrun */ #define CMD_RESP_END 0x40 /* CMD Response End */