---

yaml --- r: 261850 b: refs/heads/master c: 3984761 h: refs/heads/master v: v3
git-mirror · Jul 30, 2011 · c817092 · c817092
1 parent a126631
commit c817092
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 };