diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 07:54:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-26 07:54:40 +0100 |
| commit | a62d2d44902cf1222b5ac41ff1f61167a010cd6b (patch) | |
| tree | fd3740b483e806c03896a59a6189e5959c899579 /drivers/net/ethernet/atheros/alx/alx.h | |
| parent | f4b614adbf3aceaa4dab034665c379352777de39 (diff) | |
| parent | 2e6e902d185027f8e3cb8b7305238f7e35d6a436 (diff) | |
| download | kernel_replicant_linux-a62d2d44902cf1222b5ac41ff1f61167a010cd6b.tar.gz kernel_replicant_linux-a62d2d44902cf1222b5ac41ff1f61167a010cd6b.tar.bz2 kernel_replicant_linux-a62d2d44902cf1222b5ac41ff1f61167a010cd6b.zip | |
Merge 4.20-rc4 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/ethernet/atheros/alx/alx.h')
| -rw-r--r-- | drivers/net/ethernet/atheros/alx/alx.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h index 78c5de467426..9d0e74f6b089 100644 --- a/drivers/net/ethernet/atheros/alx/alx.h +++ b/drivers/net/ethernet/atheros/alx/alx.h @@ -140,6 +140,5 @@ struct alx_priv { }; extern const struct ethtool_ops alx_ethtool_ops; -extern const char alx_drv_name[]; #endif |