From c817092033058582352c88dd20ff85515040e427 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 8 Jun 2011 20:20:58 +0200
Subject: [PATCH] --- yaml --- r: 261850 b: refs/heads/master c:
 398476195a561271654ecce0fa27330688d326df h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/m68k/include/asm/atarihw.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index be5a464b7097..91451300c276 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0e997c20a2fbe25b0f97fb7521cdbda341c7f0a
+refs/heads/master: 398476195a561271654ecce0fa27330688d326df
diff --git a/trunk/arch/m68k/include/asm/atarihw.h b/trunk/arch/m68k/include/asm/atarihw.h
index f51f709bbf30..0392b28656ab 100644
--- a/trunk/arch/m68k/include/asm/atarihw.h
+++ b/trunk/arch/m68k/include/asm/atarihw.h
@@ -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;
 };