diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 07:25:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 07:25:25 +0200 |
| commit | 119a7fdfeecefa5a4062256ac2dcd3b69eaa8414 (patch) | |
| tree | 40d834b32ce97857f3f974c95b64b6b48d415e6e /drivers/net/Makefile | |
| parent | 086ebf92aa791b6cc8805decffca7b8898d99a4e (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | lwn-119a7fdfeecefa5a4062256ac2dcd3b69eaa8414.tar.gz lwn-119a7fdfeecefa5a4062256ac2dcd3b69eaa8414.zip | |
Merge 5.2-rc3 into usb-next
we want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 21cde7e78621..0d3ba056cda3 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -40,7 +40,7 @@ obj-$(CONFIG_ARCNET) += arcnet/ obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_CAIF) += caif/ obj-$(CONFIG_CAN) += can/ -obj-$(CONFIG_NET_DSA) += dsa/ +obj-y += dsa/ obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_HIPPI) += hippi/ |