diff options
| author |   Nithin Nayak Sujir <nsujir@broadcom.com> | 2013-01-06 12:51:10 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-01-06 21:02:08 -0800 |
| commit | b681b65d4fc0cad468c4caad02b0bc93d59b00df (patch) | |
| tree | 9f1ab74043699e4fd139c66af885d2a3ef57359b /drivers/net/ethernet/broadcom/tg3.h | |
| parent | tg3: Improve PCI function number detection. (diff) | |
| download | linux-dev-b681b65d4fc0cad468c4caad02b0bc93d59b00df.tar.xz linux-dev-b681b65d4fc0cad468c4caad02b0bc93d59b00df.zip | |
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.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index 39afc0edeaa6..9cd88a4b9a5f 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h @@ -4,7 +4,7 @@ * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com) * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com) * Copyright (C) 2004 Sun Microsystems Inc. - * Copyright (C) 2007-2012 Broadcom Corporation. + * Copyright (C) 2007-2013 Broadcom Corporation. */ #ifndef _T3_H @@ -3348,9 +3348,7 @@ struct tg3 { const struct firmware *fw; u32 fw_len; /* includes BSS */ -#if IS_ENABLED(CONFIG_HWMON) struct device *hwmon_dev; -#endif bool link_up; }; |