[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sat, 28 Mar 2009 15:18:51 +0000 (18:18 +0300)
committerEric Miao <eric.y.miao@gmail.com>
Thu, 11 Jun 2009 14:20:22 +0000 (22:20 +0800)
commit78731d33c1868f4ba43bafcca8dcaf938872c1f2
treea5d9f2ba40173182de56cae3628a5cb3eccfb6fa
parent391c5111c9ce346edc3c3d8f907eb178a6decd16
[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>
arch/arm/common/Kconfig
arch/arm/common/Makefile
arch/arm/common/sharpsl_pm.c [deleted file]
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/include/mach/sharpsl_pm.h [moved from arch/arm/include/asm/hardware/sharpsl_pm.h with 100% similarity]
arch/arm/mach-pxa/sharpsl.h
arch/arm/mach-pxa/sharpsl_pm.c