summaryrefslogtreecommitdiffstats
path: root/arch/mips/sibyte/sb1250/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-07-02 17:19:04 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-07-12 18:11:43 +0200
commit6ac5310e649df5fcd240d764503bf16a1317ea39 (patch)
tree286700815b3f30dc13cc3b2d9980b0244b244d33 /arch/mips/sibyte/sb1250/Makefile
parentMIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER (diff)
parentMIPS: tlbex: Fix size of area to be flushed. (diff)
downloadlinux-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.xz
linux-6ac5310e649df5fcd240d764503bf16a1317ea39.zip
Merge branch '3.10-fixes' into mips-for-linux-next
This that should have been fixed but weren't, way to much, intrusive and late.
Diffstat (limited to 'arch/mips/sibyte/sb1250/Makefile')
-rw-r--r--arch/mips/sibyte/sb1250/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/sibyte/sb1250/Makefile b/arch/mips/sibyte/sb1250/Makefile
index d3d969de407b..cdc4c56c3e29 100644
--- a/arch/mips/sibyte/sb1250/Makefile
+++ b/arch/mips/sibyte/sb1250/Makefile
@@ -1,4 +1,3 @@
obj-y := setup.o irq.o time.o
obj-$(CONFIG_SMP) += smp.o
-obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o