Commit ff14bfb7 authored Jul 12, 2024 by Greg Kroah-Hartman

misc: delete Makefile.rej

I accidentally added drivers/misc/Makefile.rej when applying the
mrvl-cn10k-dpi by hand. Remove it as it's not needed.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 5f67eef6 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 31643d84

drivers/misc/Makefile.rej

deleted100644 → 0

+0 −7

Original line number	Diff line number	Diff line
		--- drivers/misc/Makefile
		+++ drivers/misc/Makefile
		@@ -69,3 +69,4 @@ obj-$(CONFIG_TMR_INJECT) += xilinx_tmr_inject.o
		obj-$(CONFIG_TPS6594_ESM) += tps6594-esm.o
		obj-$(CONFIG_TPS6594_PFSM) += tps6594-pfsm.o
		obj-$(CONFIG_NSM) += nsm.o
		+obj-$(CONFIG_MARVELL_CN10K_DPI) += mrvl_cn10k_dpi.o