aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx/include/mach
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-29 07:29:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-29 07:29:40 -0700
commit249842477c589ea29ff161ace9c8666d96e9883a (patch)
tree5b041a3a703fe9c5040835b27c4a727009a242db /arch/arm/mach-lpc32xx/include/mach
parentMerge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 (diff)
parentARM: mark empty gpio.h files empty (diff)
downloadlinux-dev-249842477c589ea29ff161ace9c8666d96e9883a.tar.xz
linux-dev-249842477c589ea29ff161ace9c8666d96e9883a.zip
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: ARM: mark empty gpio.h files empty gpio: Fix ARM versatile-express build failure of: include errno.h
Diffstat (limited to 'arch/arm/mach-lpc32xx/include/mach')
-rw-r--r--arch/arm/mach-lpc32xx/include/mach/gpio.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/gpio.h b/arch/arm/mach-lpc32xx/include/mach/gpio.h
index e69de29bb2d1..40a8c178f10d 100644
--- a/arch/arm/mach-lpc32xx/include/mach/gpio.h
+++ b/arch/arm/mach-lpc32xx/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */