Skip to content

Commit

Permalink
m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
geertu committed Jul 30, 2011
1 parent a0e997c commit 3984761
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/m68k/include/asm/atarihw.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 3984761

Please sign in to comment.