projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[linux-drm-fsl-dcu.git]
/
arch
/
sh
/
boards
/
hp6xx
/
Makefile
diff --git
a/arch/sh/boards/hp6xx/Makefile
b/arch/sh/boards/hp6xx/Makefile
index 927fe0aa5dfa7ba65daddf881d9ca41577cedd4d..b3124278247c0d44707f8891f8d2e24d7543a58a 100644
(file)
--- a/
arch/sh/boards/hp6xx/Makefile
+++ b/
arch/sh/boards/hp6xx/Makefile
@@
-2,5
+2,6
@@
# Makefile for the HP6xx specific parts of the kernel
#
-obj-y := mach.o setup.o
-
+obj-y := setup.o
+obj-$(CONFIG_PM) += pm.o pm_wakeup.o
+obj-$(CONFIG_APM_EMULATION) += hp6xx_apm.o