Merge 3.17-rc3 into staging-next

[deliverable/linux.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index e66a5dbd9b02c35e44ad02bdd0a235181d10a1f1..74c679e17e77def0b456b7b3a40cd7f2280ee32a 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -48,6 +48,5 @@ obj-$(CONFIG_DGNC)                    += dgnc/
 obj-$(CONFIG_DGAP)                     += dgap/
 obj-$(CONFIG_MTD_SPINAND_MT29F)        += mt29f_spinand/
 obj-$(CONFIG_GS_FPGABOOT)      += gs_fpgaboot/
-obj-$(CONFIG_BT_NOKIA_H4P)     += nokia_h4p/
 obj-$(CONFIG_CRYPTO_SKEIN)     += skein/
 obj-$(CONFIG_UNISYSSPAR)       += unisys/