Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78731d33 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Eric Miao
Browse files

[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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 391c5111

arch/arm/common/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ config SHARP_LOCOMO 
config SHARP_PARAM

	bool



config SHARPSL_PM

	bool

	select APM_EMULATION



config SHARP_SCOOP

	bool

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-$(CONFIG_DMABOUNCE) += dmabounce.o 
obj-$(CONFIG_TIMER_ACORN)	+= time-acorn.o

obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o

obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o

arch/arm/common/sharpsl_pm.c

deleted100644 → 0
+0 −859

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ config PXA_SHARPSL 
	  SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)

	  handheld computer.



config SHARPSL_PM

	bool

	select APM_EMULATION



config CORGI_SSP_DEPRECATED

	bool

	select PXA_SSP