diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-01-13 03:56:47 +0100 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-13 04:59:56 +0100 |
commit | a99da46ac01a12e582684771b486c9292326d7a4 (patch) | |
tree | 498c7833f9efc9a35c99fa281ada1527c4b01f97 /drivers/block/Makefile | |
parent | Merge branch 'vsock-update-tools-and-error-handling' (diff) | |
parent | Merge tag 'net-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
download | linux-a99da46ac01a12e582684771b486c9292326d7a4.tar.xz linux-a99da46ac01a12e582684771b486c9292326d7a4.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/usb/r8152.c
be53771c87f4 ("r8152: add vendor/device ID pair for Microsoft Devkit")
ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
https://lore.kernel.org/all/20230113113339.658c4723@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/block/Makefile')
-rw-r--r-- | drivers/block/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 962ee65d8ca3..101612cba303 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o obj-$(CONFIG_N64CART) += n64cart.o obj-$(CONFIG_BLK_DEV_RAM) += brd.o obj-$(CONFIG_BLK_DEV_LOOP) += loop.o +obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o obj-$(CONFIG_SUNVDC) += sunvdc.o obj-$(CONFIG_BLK_DEV_NBD) += nbd.o |