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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/basic_mmio_gpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/basic_mmio_gpio.h b/include/linux/basic_mmio_gpio.h index 1ae12710d73..98999cf107c 100644 --- a/include/linux/basic_mmio_gpio.h +++ b/include/linux/basic_mmio_gpio.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
| 19 | #include <linux/spinlock_types.h> | ||
| 19 | 20 | ||
| 20 | struct bgpio_pdata { | 21 | struct bgpio_pdata { |
| 21 | int base; | 22 | int base; |