[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>
This commit is contained in:
Dmitry Eremin-Solenikov
2009-03-28 18:18:51 +03:00
committed by Eric Miao
parent 391c5111c9
commit 78731d33c1
7 changed files with 838 additions and 866 deletions

View File

@@ -7,7 +7,7 @@
*
*/
#include <asm/hardware/sharpsl_pm.h>
#include <mach/sharpsl_pm.h>
/*
* SharpSL SSP Driver