git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
Makefile
diff --git
a/arch/arm/mach-s5pv210/Makefile
b/arch/arm/mach-s5pv210/Makefile
index
ef7e466
..
009fbe5
100644
(file)
--- a/
arch/arm/mach-s5pv210/Makefile
+++ b/
arch/arm/mach-s5pv210/Makefile
@@
-14,7
+14,7
@@
obj- :=
obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o
obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o
-obj-$(CONFIG_PM) += pm.o
sleep.o
+obj-$(CONFIG_PM) += pm.o
# machine support