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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-s3c24xx
/
Makefile
diff --git
a/arch/arm/plat-s3c24xx/Makefile
b/arch/arm/plat-s3c24xx/Makefile
index 1e0767b266b8e9d6963bb390a02b1bf203b9b801..636cb12711df8e98de68cce12d0196d10529da94 100644
(file)
--- a/
arch/arm/plat-s3c24xx/Makefile
+++ b/
arch/arm/plat-s3c24xx/Makefile
@@
-27,6
+27,7
@@
obj-$(CONFIG_CPU_S3C244X) += s3c244x-irq.o
obj-$(CONFIG_CPU_S3C244X) += s3c244x-clock.o
obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o
obj-$(CONFIG_PM) += pm.o
+obj-$(CONFIG_PM) += irq-pm.o
obj-$(CONFIG_PM) += sleep.o
obj-$(CONFIG_HAVE_PWM) += pwm.o
obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o