diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:06:36 -0400 |
| commit | 809b4e00baf006a990a73329ba381d536c6fa277 (patch) | |
| tree | e949e0efd019d6f932537aba762792b07a84351c /arch/arm/mach-pxa/palmtx.c | |
| parent | a0a55682b83fd5f012afadcf415b030d7424ae68 (diff) | |
| parent | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/palmtx.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 144dc2b6911f..89a37922b9d3 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
| 44 | #include <mach/pxafb.h> | 44 | #include <mach/pxafb.h> |
| 45 | #include <mach/irda.h> | 45 | #include <mach/irda.h> |
| 46 | #include <mach/pxa27x_keypad.h> | 46 | #include <plat/pxa27x_keypad.h> |
| 47 | #include <mach/udc.h> | 47 | #include <mach/udc.h> |
| 48 | #include <mach/palmasoc.h> | 48 | #include <mach/palmasoc.h> |
| 49 | #include <mach/palm27x.h> | 49 | #include <mach/palm27x.h> |