m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_
authorGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 8 Jun 2011 18:20:58 +0000 (20:20 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sat, 30 Jul 2011 19:21:39 +0000 (21:21 +0200)
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>
arch/m68k/include/asm/atarihw.h

index f51f709bbf3036f8ee7438eafe64226c1c02b043..0392b28656abb306e330fe5d4edcf44a9b5f2a7e 100644 (file)
@@ -399,8 +399,8 @@ struct CODEC
 #define CODEC_OVERFLOW_LEFT     2
   u_char unused2, unused3, unused4, unused5;
   u_char gpio_directions;
-#define GPIO_IN                 0
-#define GPIO_OUT                1
+#define CODEC_GPIO_IN           0
+#define CODEC_GPIO_OUT          1
   u_char unused6;
   u_char gpio_data;
 };