projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
mach-imx
/
Makefile
diff --git
a/arch/arm/mach-imx/Makefile
b/arch/arm/mach-imx/Makefile
index 2636adfcb999cd6ecd7b8e10b5bc15868f027dc5..cab128913e72a710a0f405336b0d814e56935546 100644
(file)
--- a/
arch/arm/mach-imx/Makefile
+++ b/
arch/arm/mach-imx/Makefile
@@
-27,6
+27,7
@@
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o
obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o
+obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o
endif
ifdef CONFIG_SND_IMX_SOC