git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c64xx
/
Makefile
diff --git
a/arch/arm/mach-s3c64xx/Makefile
b/arch/arm/mach-s3c64xx/Makefile
index 12f67b61ca5f7e7340821f21744530bef0ec844d..17f4b07ec763b65936664522e3bd8c230876722c 100644
(file)
--- a/
arch/arm/mach-s3c64xx/Makefile
+++ b/
arch/arm/mach-s3c64xx/Makefile
@@
-16,7
+16,8
@@
obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
# PM
-obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o
+obj-$(CONFIG_PM) += pm.o
+obj-$(CONFIG_PM_SLEEP) += irq-pm.o sleep.o
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
# DMA support