diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 18:48:26 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 18:48:26 +0200 |
| commit | 0337966d121ebebf73a1c346123e8112796e684e (patch) | |
| tree | c0d4388591e72dc5a26ee976a9cbca70f6bafbbd /drivers/net/ethernet/netronome/Makefile | |
| parent | Input: i8042 - add Clevo P650RS to the i8042 reset list (diff) | |
| parent | Input: ar1021_i2c - use BIT to check for a bit (diff) | |
| download | linux-0337966d121ebebf73a1c346123e8112796e684e.tar.xz linux-0337966d121ebebf73a1c346123e8112796e684e.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.12 merge window.
Diffstat (limited to 'drivers/net/ethernet/netronome/Makefile')
| -rw-r--r-- | drivers/net/ethernet/netronome/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/Makefile b/drivers/net/ethernet/netronome/Makefile index dcb7b383f634..7fb3b84b5556 100644 --- a/drivers/net/ethernet/netronome/Makefile +++ b/drivers/net/ethernet/netronome/Makefile @@ -2,4 +2,4 @@ # Makefile for the Netronome network device drivers # -obj-$(CONFIG_NFP_NETVF) += nfp/ +obj-$(CONFIG_NFP) += nfp/ |