diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/m68k/include/asm/atarihw.h | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/m68k/include/asm/atarihw.h')
| -rw-r--r-- | arch/m68k/include/asm/atarihw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h index f51f709bbf30..0392b28656ab 100644 --- a/arch/m68k/include/asm/atarihw.h +++ b/arch/m68k/include/asm/atarihw.h | |||
| @@ -399,8 +399,8 @@ struct CODEC | |||
| 399 | #define CODEC_OVERFLOW_LEFT 2 | 399 | #define CODEC_OVERFLOW_LEFT 2 |
| 400 | u_char unused2, unused3, unused4, unused5; | 400 | u_char unused2, unused3, unused4, unused5; |
| 401 | u_char gpio_directions; | 401 | u_char gpio_directions; |
| 402 | #define GPIO_IN 0 | 402 | #define CODEC_GPIO_IN 0 |
| 403 | #define GPIO_OUT 1 | 403 | #define CODEC_GPIO_OUT 1 |
| 404 | u_char unused6; | 404 | u_char unused6; |
| 405 | u_char gpio_data; | 405 | u_char gpio_data; |
| 406 | }; | 406 | }; |