summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/palmtreo.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 15:20:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 15:20:21 +0100
commit7f9c7e28119cf21ae1a035240da3705647d0d06a (patch)
treec0a1568e21c5ce6cd4112e44071040a3e611a9ec /arch/arm/mach-pxa/palmtreo.c
parent4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff)
parentb476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/palmtreo.c')
-rw-r--r--arch/arm/mach-pxa/palmtreo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index 52defd5e42e..f685a600a18 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -39,7 +39,7 @@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
-#include <mach/pxa27x_keypad.h>
+#include <plat/pxa27x_keypad.h>
#include <mach/udc.h>
#include <mach/ohci.h>
#include <mach/pxa2xx-regs.h>