diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-04 09:16:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-04 09:16:43 +0200 |
| commit | 8bf7a12c628d1cad59cd8057171dd3ef95f0857a (patch) | |
| tree | 31bd590f6dfb61e351be19bfcbc636e8b30ecce3 /drivers/net/ethernet/micrel/Makefile | |
| parent | 20ac422c8ef753ae0da0c9312443b03c37cfbb5b (diff) | |
| parent | 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 (diff) | |
| download | linux-8bf7a12c628d1cad59cd8057171dd3ef95f0857a.tar.bz2 | |
Merge 5.15-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/micrel/Makefile')
| -rw-r--r-- | drivers/net/ethernet/micrel/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile index 5cc00d22c708..6ecc4eb30e74 100644 --- a/drivers/net/ethernet/micrel/Makefile +++ b/drivers/net/ethernet/micrel/Makefile @@ -4,8 +4,6 @@ # obj-$(CONFIG_KS8842) += ks8842.o -obj-$(CONFIG_KS8851) += ks8851.o -ks8851-objs = ks8851_common.o ks8851_spi.o -obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o -ks8851_mll-objs = ks8851_common.o ks8851_par.o +obj-$(CONFIG_KS8851) += ks8851_common.o ks8851_spi.o +obj-$(CONFIG_KS8851_MLL) += ks8851_common.o ks8851_par.o obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o |