Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

[~andy/linux] / drivers / staging / tidspbridge / Makefile

diff --git a/drivers/staging/tidspbridge/Makefile b/drivers/staging/tidspbridge/Makefile
index fd6a2761cc3bd4ddfc1a33ac2565fa56ca0a4857..8c8c92a9083f9f52a9df6fd15d93e39a927c873d 100644 (file)
--- a/drivers/staging/tidspbridge/Makefile
+++ b/drivers/staging/tidspbridge/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_TIDSPBRIDGE)      += bridgedriver.o
+obj-$(CONFIG_TIDSPBRIDGE)      += tidspbridge.o
 
 libgen = gen/gh.o gen/uuidutil.o
 libcore = core/chnl_sm.o core/msg_sm.o core/io_sm.o core/tiomap3430.o \
@@ -13,7 +13,7 @@ libdload = dynload/cload.o dynload/getsection.o dynload/reloc.o \
                 dynload/tramp.o
 libhw = hw/hw_mmu.o
 
-bridgedriver-y := $(libgen) $(libservices) $(libcore) $(libpmgr) $(librmgr) \
+tidspbridge-y := $(libgen) $(libservices) $(libcore) $(libpmgr) $(librmgr) \
                        $(libdload) $(libhw)
 
 #Machine dependent