aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/sibyte/swarm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-23 11:11:42 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-23 11:11:42 +0200
commitf34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch)
tree0816c565d26ae24854616faa0d497be365c2fe8b /arch/mips/sibyte/swarm
parentee4311adf105f4d740f52e3948acc1d81598afcc (diff)
parent481c5346d0981940ee63037eb53e4e37b0735c10 (diff)
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/mips/sibyte/swarm')
-rw-r--r--arch/mips/sibyte/swarm/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile
index 2d626039195..1775755a261 100644
--- a/arch/mips/sibyte/swarm/Makefile
+++ b/arch/mips/sibyte/swarm/Makefile
@@ -1,3 +1,3 @@
-lib-y = setup.o rtc_xicor1241.o rtc_m41t81.o
+obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o
-lib-$(CONFIG_KGDB) += dbg_io.o
+obj-$(CONFIG_KGDB) += dbg_io.o