Commit 39847619 authored Jun 08, 2011 by Geert Uytterhoeven

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>

parent a0e997c2

arch/m68k/include/asm/atarihw.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		};