diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-07-12 16:41:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-07-12 16:41:47 +0200 |
| commit | ff14bfb7bc0480c343356b82c126290a4774bcbe (patch) | |
| tree | e1f6b77c668fd261d2c51eee8634f5f7300c54e1 /drivers/misc | |
| parent | binder: fix hang of unregistered readers (diff) | |
| download | linux-ff14bfb7bc0480c343356b82c126290a4774bcbe.tar.xz linux-ff14bfb7bc0480c343356b82c126290a4774bcbe.zip | |
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: 5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -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 |