summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-omap/board-palmte.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-12 13:27:22 +0400
committerIngo Molnar <mingo@elte.hu>2008-06-12 13:27:22 +0400
commitbb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch)
treee63681727543bcc3251bbc82b81a9cc822cc3f5e /include/asm-arm/arch-omap/board-palmte.h
parent4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff)
parent5e70b7f3c24468bb1635b295945edb48ecd9656a (diff)
downloadlinux-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.tar.xz
Merge branch 'linus' into x86/gart
Diffstat (limited to 'include/asm-arm/arch-omap/board-palmte.h')
-rw-r--r--include/asm-arm/arch-omap/board-palmte.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-omap/board-palmte.h b/include/asm-arm/arch-omap/board-palmte.h
index cd22035a7160..6fac2c8935be 100644
--- a/include/asm-arm/arch-omap/board-palmte.h
+++ b/include/asm-arm/arch-omap/board-palmte.h
@@ -14,8 +14,6 @@
#ifndef __OMAP_BOARD_PALMTE_H
#define __OMAP_BOARD_PALMTE_H
-#include <asm/arch/gpio.h>
-
#define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USB_OR_DC_GPIO 1
#define PALMTE_TSC_GPIO 4