diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:23:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:23:11 -0400 |
| commit | 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 (patch) | |
| tree | a802614e01460631c694dfa118642d54c3d5fc79 /arch/arm/mach-pxa/corgi.c | |
| parent | e33b9dfa3008fcaa908dc0c8c472a812c400f839 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/arm/mach-pxa/corgi.c')
| -rw-r--r-- | arch/arm/mach-pxa/corgi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index be37586cb1b0..60c8b9d8bb9c 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <asm/arch/mmc.h> | 36 | #include <asm/arch/mmc.h> |
| 37 | #include <asm/arch/udc.h> | 37 | #include <asm/arch/udc.h> |
| 38 | #include <asm/arch/corgi.h> | 38 | #include <asm/arch/corgi.h> |
| 39 | #include <asm/arch/sharpsl.h> | ||
| 39 | 40 | ||
| 40 | #include <asm/mach/sharpsl_param.h> | 41 | #include <asm/mach/sharpsl_param.h> |
| 41 | #include <asm/hardware/scoop.h> | 42 | #include <asm/hardware/scoop.h> |