diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2020-04-17 08:12:22 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2020-04-17 08:12:22 +0200 |
| commit | 08d99b2c23dfa84ca5b5e5c194062a0550888b71 (patch) | |
| tree | f4cf81ba52b375bbafd3b7ee2603b3a4cae7fe30 /drivers/net/ethernet/chelsio/cxgb/common.h | |
| parent | drm: Don't free a struct never allocated by drm_gem_fb_init() (diff) | |
| parent | Linux 5.7-rc1 (diff) | |
| download | wireguard-linux-08d99b2c23dfa84ca5b5e5c194062a0550888b71.tar.xz wireguard-linux-08d99b2c23dfa84ca5b5e5c194062a0550888b71.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging required to pull topic/phy-compliance.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb/common.h')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/common.h b/drivers/net/ethernet/chelsio/cxgb/common.h index 94b9482f14a5..6475060649e9 100644 --- a/drivers/net/ethernet/chelsio/cxgb/common.h +++ b/drivers/net/ethernet/chelsio/cxgb/common.h @@ -55,7 +55,6 @@ #define DRV_DESCRIPTION "Chelsio 10Gb Ethernet Driver" #define DRV_NAME "cxgb" -#define DRV_VERSION "2.2" #define CH_DEVICE(devid, ssid, idx) \ { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx } |