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 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
Makefile
diff --git
a/arch/arm/mach-omap1/Makefile
b/arch/arm/mach-omap1/Makefile
index
facfaeb
..
9a304d8
100644
(file)
--- a/
arch/arm/mach-omap1/Makefile
+++ b/
arch/arm/mach-omap1/Makefile
@@
-12,7
+12,7
@@
obj-$(CONFIG_OMAP_MPU_TIMER) += time.o
obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
# Power Management
-obj-$(CONFIG_PM) += pm.o sleep.o
+obj-$(CONFIG_PM) += pm.o sleep.o
pm_bus.o
# DSP
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o