diff options
| author | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
| commit | b4da00601edd39184fa187d5fd6dfc36232991cc (patch) | |
| tree | f58bafde4efd814bb78b4f531b1eab48dcf8e561 /include/net/bonding.h | |
| parent | d5a7d45fb5b667fd10a225ccf11fe395fb2417d9 (diff) | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
Merge 4.1-rc2 into staging-next
We want the fixes in here to make merges and testing easier.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/net/bonding.h')
| -rw-r--r-- | include/net/bonding.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index fda6feeb6c1f..78ed135e9dea 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -30,13 +30,6 @@ #include <net/bond_alb.h> #include <net/bond_options.h> -#define DRV_VERSION "3.7.1" -#define DRV_RELDATE "April 27, 2011" -#define DRV_NAME "bonding" -#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" - -#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n" - #define BOND_MAX_ARP_TARGETS 16 #define BOND_DEFAULT_MIIMON 100 |