summaryrefslogtreecommitdiffstats
path: root/arch
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
parent18c0635363364ca2fc2d1cbd65bbf918daf89d1a (diff)
parent81397a625d063403d80a25bba00fa1cb6d7e04f5 (diff)
downloadlinux-249842477c589ea29ff161ace9c8666d96e9883a.tar.bz2
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')
-rw-r--r--arch/arm/mach-lpc32xx/include/mach/gpio.h1
-rw-r--r--arch/arm/mach-tegra/include/mach/gpio.h1
-rw-r--r--arch/arm/mach-u300/include/mach/gpio.h1
-rw-r--r--arch/arm/mach-vexpress/include/mach/gpio.h1
4 files changed, 4 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 */
diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h
index e69de29bb2d1..40a8c178f10d 100644
--- a/arch/arm/mach-tegra/include/mach/gpio.h
+++ b/arch/arm/mach-tegra/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */
diff --git a/arch/arm/mach-u300/include/mach/gpio.h b/arch/arm/mach-u300/include/mach/gpio.h
index e69de29bb2d1..40a8c178f10d 100644
--- a/arch/arm/mach-u300/include/mach/gpio.h
+++ b/arch/arm/mach-u300/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */
diff --git a/arch/arm/mach-vexpress/include/mach/gpio.h b/arch/arm/mach-vexpress/include/mach/gpio.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/arm/mach-vexpress/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */