diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 14:03:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 14:03:29 -0400 |
| commit | 08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 (patch) | |
| tree | c72495139623f39b870fddab0aa366db79988b6d /arch/arm/plat-nomadik/include/plat/gpio.h | |
| parent | 152b92db7ad2c6d6c11c8eab07e90b73a90c8b76 (diff) | |
| parent | e5ea3f12d41d96edf4ad9374db2b1725e457acec (diff) | |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
gpio/basic_mmio: add missing include of spinlock_types.h
gpio/nomadik: fix sleepmode for elder Nomadik
Diffstat (limited to 'arch/arm/plat-nomadik/include/plat/gpio.h')
| -rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/gpio.h b/arch/arm/plat-nomadik/include/plat/gpio.h index ea19a5b2f227..d5d7e651269c 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio.h +++ b/arch/arm/plat-nomadik/include/plat/gpio.h | |||
| @@ -90,6 +90,7 @@ struct nmk_gpio_platform_data { | |||
| 90 | int num_gpio; | 90 | int num_gpio; |
| 91 | u32 (*get_secondary_status)(unsigned int bank); | 91 | u32 (*get_secondary_status)(unsigned int bank); |
| 92 | void (*set_ioforce)(bool enable); | 92 | void (*set_ioforce)(bool enable); |
| 93 | bool supports_sleepmode; | ||
| 93 | }; | 94 | }; |
| 94 | 95 | ||
| 95 | #endif /* __ASM_PLAT_GPIO_H */ | 96 | #endif /* __ASM_PLAT_GPIO_H */ |