aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/common/Makefile
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-03-28 18:18:51 +0300
committerEric Miao <eric.y.miao@gmail.com>2009-06-11 22:20:22 +0800
commit78731d33c1868f4ba43bafcca8dcaf938872c1f2 (patch)
treea5d9f2ba40173182de56cae3628a5cb3eccfb6fa /arch/arm/common/Makefile
parent391c5111c9ce346edc3c3d8f907eb178a6decd16 (diff)
downloadvexpress-lsk-78731d33c1868f4ba43bafcca8dcaf938872c1f2.tar.gz
[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/common/Makefile')
-rw-r--r--arch/arm/common/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 7cb7961d81c..76be7ff2a7c 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -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