aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 11:03:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 11:03:29 -0700
commit08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 (patch)
treec72495139623f39b870fddab0aa366db79988b6d /include/linux
parent152b92db7ad2c6d6c11c8eab07e90b73a90c8b76 (diff)
parente5ea3f12d41d96edf4ad9374db2b1725e457acec (diff)
downloadlinux-stericsson-08d63aac436b2ad35d9e864b9ebb05bc8b9bb653.tar.gz
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/linux')
-rw-r--r--include/linux/basic_mmio_gpio.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/basic_mmio_gpio.h b/include/linux/basic_mmio_gpio.h
index 1ae12710d732..98999cf107ce 100644
--- a/include/linux/basic_mmio_gpio.h
+++ b/include/linux/basic_mmio_gpio.h
@@ -16,6 +16,7 @@
#include <linux/gpio.h>
#include <linux/types.h>
#include <linux/compiler.h>
+#include <linux/spinlock_types.h>
struct bgpio_pdata {
int base;