commit 78731d33c1868f4ba43bafcca8dcaf938872c1f2
author Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Sat Mar 28 18:18:51 2009 +0300
committer Eric Miao <eric.y.miao@gmail.com> Thu Jun 11 22:20:22 2009 +0800
tree a5d9f2ba40173182de56cae3628a5cb3eccfb6fa
parent 391c5111c9ce346edc3c3d8f907eb178a6decd16

[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/mach-pxa/sharpsl.h

diff --git a/arch/arm/mach-pxa/sharpsl.h b/arch/arm/mach-pxa/sharpsl.h
index 047909a..f1cd00e 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