[Blackfin] arch: Resolve the clash issue of UART defines between blackfin headers and include/linux/serial_reg.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Cc: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 7e8ceea9b5d1..72477c252a94 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -95,14 +95,14 @@ enum {
         AWA_data_clear = SYSCR,
         AWA_data_set = SYSCR,
         AWA_toggle = SYSCR,
-        AWA_maska = UART_SCR,
-        AWA_maska_clear = UART_SCR,
-        AWA_maska_set = UART_SCR,
-        AWA_maska_toggle = UART_SCR,
-        AWA_maskb = UART_GCTL,
-        AWA_maskb_clear = UART_GCTL,
-        AWA_maskb_set = UART_GCTL,
-        AWA_maskb_toggle = UART_GCTL,
+        AWA_maska = BFIN_UART_SCR,
+        AWA_maska_clear = BFIN_UART_SCR,
+        AWA_maska_set = BFIN_UART_SCR,
+        AWA_maska_toggle = BFIN_UART_SCR,
+        AWA_maskb = BFIN_UART_GCTL,
+        AWA_maskb_clear = BFIN_UART_GCTL,
+        AWA_maskb_set = BFIN_UART_GCTL,
+        AWA_maskb_toggle = BFIN_UART_GCTL,
         AWA_dir = SPORT1_STAT,
         AWA_polar = SPORT1_STAT,
         AWA_edge = SPORT1_STAT,