summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include/mach/gpio.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:18:30 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:18:30 +0100
commitcf1fb2dfa7601770037d24a328f259e2cfd97fb0 (patch)
tree1a38c170cc73ca9fa02b69a3194f487b0c1ef55c /arch/arm/mach-omap2/include/mach/gpio.h
parentc9b1c7b34a17742054e2b967f7c126964343e4f2 (diff)
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff)
Merge branch 'omap/headers4' into next/drivers
This avoids merge conflicts between the omap header changes and the gpmc updates. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/gpio.h')
-rw-r--r--arch/arm/mach-omap2/include/mach/gpio.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/include/mach/gpio.h b/arch/arm/mach-omap2/include/mach/gpio.h
deleted file mode 100644
index 5621cc59c9f..00000000000
--- a/arch/arm/mach-omap2/include/mach/gpio.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * arch/arm/mach-omap2/include/mach/gpio.h
- */