diff options
| -rw-r--r-- | drivers/misc/Makefile.rej | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/misc/Makefile.rej b/drivers/misc/Makefile.rej deleted file mode 100644 index a6aaed13f950..000000000000 --- 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 |