Merge tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / Makefile

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8479d47d78d7538383de706fbb9d20257465f4da..ad7b4ca412ef12c42407a58f5989186fbff78700 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_GOLDFISH)                += goldfish/
 obj-$(CONFIG_DGNC)                     += dgnc/
 obj-$(CONFIG_MTD_SPINAND_MT29F)        += mt29f_spinand/
 obj-$(CONFIG_GS_FPGABOOT)      += gs_fpgaboot/
-obj-$(CONFIG_CRYPTO_SKEIN)     += skein/
 obj-$(CONFIG_UNISYSSPAR)       += unisys/
 obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)  += clocking-wizard/
 obj-$(CONFIG_FB_TFT)           += fbtft/
@@ -47,9 +46,11 @@ obj-$(CONFIG_DRM_VBOXVIDEO)  += vboxvideo/
 obj-$(CONFIG_PI433)            += pi433/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-pci/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-pinctrl/
-obj-$(CONFIG_SOC_MT7621)       += mt7621-gpio/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-spi/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-dma/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-mmc/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-eth/
 obj-$(CONFIG_SOC_MT7621)       += mt7621-dts/
+obj-$(CONFIG_STAGING_GASKET_FRAMEWORK) += gasket/
+obj-$(CONFIG_XIL_AXIS_FIFO)    += axis-fifo/
+obj-$(CONFIG_EROFS_FS)         += erofs/