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 <[email protected]>
Fixes: 5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/misc/Makefile.rej b/drivers/misc/Makefile.rej
deleted file mode 100644 (file)
index a6aaed1..0000000
--- a/drivers/misc/Makefile.rej
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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