diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-07-02 19:19:04 +0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-12 20:11:43 +0400 |
commit | 6ac5310e649df5fcd240d764503bf16a1317ea39 (patch) | |
tree | 286700815b3f30dc13cc3b2d9980b0244b244d33 /arch/mips/sibyte/common/Makefile | |
parent | 704e6460ab75af0735b1ca7c0dcaa4ff0a4001b2 (diff) | |
parent | 3f90b82df110ef9cb33761b56ca85ae0d0372d4a (diff) | |
download | linux-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.xz |
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/common/Makefile')
-rw-r--r-- | arch/mips/sibyte/common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/sibyte/common/Makefile b/arch/mips/sibyte/common/Makefile index 36aa700cc40c..b3d6bf23a662 100644 --- a/arch/mips/sibyte/common/Makefile +++ b/arch/mips/sibyte/common/Makefile @@ -1,3 +1,4 @@ obj-y := cfe.o +obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o obj-$(CONFIG_SIBYTE_CFE_CONSOLE) += cfe_console.o obj-$(CONFIG_SIBYTE_TBPROF) += sb_tbprof.o |