aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-06-08 14:20:58 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-07-30 15:21:39 -0400
commit398476195a561271654ecce0fa27330688d326df (patch)
tree25434a41687bb211b11c90f23c09a6094714b335
parenta0e997c20a2fbe25b0f97fb7521cdbda341c7f0a (diff)
m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_
These defines are way to generic, and cause conflicts: drivers/net/wireless/rtlwifi/rtl8192c/../rtl8192ce/reg.h:369:1: warning: "GPIO_IN" redefined drivers/net/wireless/rtlwifi/rtl8192c/../rtl8192ce/reg.h:370:1: warning: "GPIO_OUT" redefined drivers/net/wireless/rtlwifi/rtl8192se/reg.h:252:1: warning: "GPIO_IN" redefined drivers/net/wireless/rtlwifi/rtl8192se/reg.h:253:1: warning: "GPIO_OUT" redefined Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/include/asm/atarihw.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h
index f51f709bbf3..0392b28656a 100644
--- a/arch/m68k/include/asm/atarihw.h
+++ b/arch/m68k/include/asm/atarihw.h
@@ -399,8 +399,8 @@ struct CODEC
399#define CODEC_OVERFLOW_LEFT 2 399#define CODEC_OVERFLOW_LEFT 2
400 u_char unused2, unused3, unused4, unused5; 400 u_char unused2, unused3, unused4, unused5;
401 u_char gpio_directions; 401 u_char gpio_directions;
402#define GPIO_IN 0 402#define CODEC_GPIO_IN 0
403#define GPIO_OUT 1 403#define CODEC_GPIO_OUT 1
404 u_char unused6; 404 u_char unused6;
405 u_char gpio_data; 405 u_char gpio_data;
406}; 406};