diff options
| author | Dmitry Eremin-Solenikov | 2009-03-28 16:18:51 +0100 |
|---|---|---|
| committer | Eric Miao | 2009-06-11 16:20:22 +0200 |
| commit | 78731d33c1868f4ba43bafcca8dcaf938872c1f2 (patch) | |
| tree | a5d9f2ba40173182de56cae3628a5cb3eccfb6fa /arch/arm/mach-pxa/sharpsl.h | |
| parent | [ARM] sa1100: remove unused collie_pm.c (diff) | |
| download | kernel-qcow2-linux-78731d33c1868f4ba43bafcca8dcaf938872c1f2.tar.gz kernel-qcow2-linux-78731d33c1868f4ba43bafcca8dcaf938872c1f2.tar.xz kernel-qcow2-linux-78731d33c1868f4ba43bafcca8dcaf938872c1f2.zip | |
[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 @@ * */ -#include <asm/hardware/sharpsl_pm.h> +#include <mach/sharpsl_pm.h> /* * SharpSL SSP Driver |