diff options
author | Nithin Nayak Sujir <nsujir@broadcom.com> | 2013-01-06 07:51:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-07 00:02:08 -0500 |
commit | b681b65d4fc0cad468c4caad02b0bc93d59b00df (patch) | |
tree | 9f1ab74043699e4fd139c66af885d2a3ef57359b /drivers/net/ethernet/broadcom/tg3.c | |
parent | 857001f06f6bec17cafd567a03b24968902a4744 (diff) |
tg3: Remove IS_ENABLED(CONFIG_HWMON) check
Commit de0a41484c47d783dd4d442914815076aa2caac2 added Kconfig logic to
select HWMON and removed all the IS_ENABLED(CONFIG_HWMON) checks in the
tg3.c file. It missed this one check in the header.
Update version to 3.129 and update copyright year.
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 3596b7b23da1..bc4d98991a32 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com) |
5 | * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com) | 5 | * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com) |
6 | * Copyright (C) 2004 Sun Microsystems Inc. | 6 | * Copyright (C) 2004 Sun Microsystems Inc. |
7 | * Copyright (C) 2005-2012 Broadcom Corporation. | 7 | * Copyright (C) 2005-2013 Broadcom Corporation. |
8 | * | 8 | * |
9 | * Firmware is: | 9 | * Firmware is: |
10 | * Derived from proprietary unpublished source code, | 10 | * Derived from proprietary unpublished source code, |
@@ -93,10 +93,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits) | |||
93 | 93 | ||
94 | #define DRV_MODULE_NAME "tg3" | 94 | #define DRV_MODULE_NAME "tg3" |
95 | #define TG3_MAJ_NUM 3 | 95 | #define TG3_MAJ_NUM 3 |
96 | #define TG3_MIN_NUM 128 | 96 | #define TG3_MIN_NUM 129 |
97 | #define DRV_MODULE_VERSION \ | 97 | #define DRV_MODULE_VERSION \ |
98 | __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM) | 98 | __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM) |
99 | #define DRV_MODULE_RELDATE "December 03, 2012" | 99 | #define DRV_MODULE_RELDATE "January 06, 2013" |
100 | 100 | ||
101 | #define RESET_KIND_SHUTDOWN 0 | 101 | #define RESET_KIND_SHUTDOWN 0 |
102 | #define RESET_KIND_INIT 1 | 102 | #define RESET_KIND_INIT 1 |