summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/Makefile
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2011-11-25 05:25:39 +0100
committerBenjamin Herrenschmidt2011-11-25 05:25:39 +0100
commit56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch)
treefc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/platforms/85xx/Makefile
parentpowerpc/mpic: Remove extra semicolon. (diff)
parentdrivers/serial/ucc_uart.c: Add missing call to init UCC UART port timeout (diff)
downloadkernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.gz
kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.xz
kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.zip
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx/Makefile')
-rw-r--r--arch/powerpc/platforms/85xx/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index bc5acb95917a..9cb2d4320dcc 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -3,6 +3,8 @@
#
obj-$(CONFIG_SMP) += smp.o
+obj-y += common.o
+
obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o