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 tag 'ntb-3.13' of git://github.com/jonmason/ntb
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-imx
/
Makefile
diff --git
a/arch/arm/mach-imx/Makefile
b/arch/arm/mach-imx/Makefile
index 5383c589ad719105d104c077bac14ff73e1933eb..1789e2b3190389f287a4ce79a747b17c1072a48d 100644
(file)
--- a/
arch/arm/mach-imx/Makefile
+++ b/
arch/arm/mach-imx/Makefile
@@
-102,6
+102,8
@@
obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
ifeq ($(CONFIG_PM),y)
obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
+# i.MX6SL reuses i.MX6Q code
+obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o
endif
# i.MX5 based machines