diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 10:20:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 10:20:21 -0400 |
| commit | 7f9c7e28119cf21ae1a035240da3705647d0d06a (patch) | |
| tree | c0a1568e21c5ce6cd4112e44071040a3e611a9ec /arch/arm/mach-pxa/palmt5.c | |
| parent | 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff) | |
| parent | b476ef059ec9e49d4f2a4280b862b446ef3866e8 (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/palmt5.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmt5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 1c281995f658..5b9f766d1468 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/mmc.h> | 39 | #include <mach/mmc.h> |
| 40 | #include <mach/pxafb.h> | 40 | #include <mach/pxafb.h> |
| 41 | #include <mach/irda.h> | 41 | #include <mach/irda.h> |
| 42 | #include <mach/pxa27x_keypad.h> | 42 | #include <plat/pxa27x_keypad.h> |
| 43 | #include <mach/udc.h> | 43 | #include <mach/udc.h> |
| 44 | #include <mach/palmasoc.h> | 44 | #include <mach/palmasoc.h> |
| 45 | #include <mach/palm27x.h> | 45 | #include <mach/palm27x.h> |