diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 03:00:33 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 03:00:33 -0400 |
| commit | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (patch) | |
| tree | 6d58e91731385281436da191e82c56cd1627482f /arch/mips/include | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 59cc1dd97ca9ac0363ef2f770901fbd86e2b970a (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/mach-rc32434/gpio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h index 3cb50d17b62d..12ee8d510160 100644 --- a/arch/mips/include/asm/mach-rc32434/gpio.h +++ b/arch/mips/include/asm/mach-rc32434/gpio.h | |||
| @@ -80,6 +80,9 @@ struct rb532_gpio_reg { | |||
| 80 | /* Compact Flash GPIO pin */ | 80 | /* Compact Flash GPIO pin */ |
| 81 | #define CF_GPIO_NUM 13 | 81 | #define CF_GPIO_NUM 13 |
| 82 | 82 | ||
| 83 | /* S1 button GPIO (shared with UART0_SIN) */ | ||
| 84 | #define GPIO_BTN_S1 1 | ||
| 85 | |||
| 83 | extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); | 86 | extern void rb532_gpio_set_ilevel(int bit, unsigned gpio); |
| 84 | extern void rb532_gpio_set_istat(int bit, unsigned gpio); | 87 | extern void rb532_gpio_set_istat(int bit, unsigned gpio); |
| 85 | extern void rb532_gpio_set_func(unsigned gpio); | 88 | extern void rb532_gpio_set_func(unsigned gpio); |