git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'slab/urgent' into slab/next
[pandora-kernel.git]
/
arch
/
m68k
/
include
/
asm
/
atarihw.h
diff --git
a/arch/m68k/include/asm/atarihw.h
b/arch/m68k/include/asm/atarihw.h
index
f51f709
..
0392b28
100644
(file)
--- a/
arch/m68k/include/asm/atarihw.h
+++ b/
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;
};