diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-03-28 11:18:51 -0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-11 10:20:22 -0400 |
| commit | 78731d33c1868f4ba43bafcca8dcaf938872c1f2 (patch) | |
| tree | a5d9f2ba40173182de56cae3628a5cb3eccfb6fa /arch/arm/mach-pxa/sharpsl.h | |
| parent | 391c5111c9ce346edc3c3d8f907eb178a6decd16 (diff) | |
[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
collie_pm was the only non-PXA user of sharpsl_pm. Now as it's gone we
can merge code into one single file to allow further cleanup.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/sharpsl.h')
| -rw-r--r-- | arch/arm/mach-pxa/sharpsl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/sharpsl.h b/arch/arm/mach-pxa/sharpsl.h index 047909a76651..f1cd00ea0322 100644 --- a/arch/arm/mach-pxa/sharpsl.h +++ b/arch/arm/mach-pxa/sharpsl.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <asm/hardware/sharpsl_pm.h> | 10 | #include <mach/sharpsl_pm.h> |
| 11 | 11 | ||
| 12 | /* | 12 | /* |
| 13 | * SharpSL SSP Driver | 13 | * SharpSL SSP Driver |