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/freescale/fs_enet/fs_enet.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/freescale/fs_enet/fs_enet.h')
| -rw-r--r-- | drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h index 195fae6aec4a..5ff2634bee2f 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet.h +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h @@ -190,8 +190,6 @@ void fs_cleanup_bds(struct net_device *dev); #define DRV_MODULE_NAME "fs_enet" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.1" -#define DRV_MODULE_RELDATE "Sep 22, 2014" /***************************************************************************/ |