Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b681b65d authored by Nithin Nayak Sujir's avatar Nithin Nayak Sujir Committed by David S. Miller
Browse files

tg3: Remove IS_ENABLED(CONFIG_HWMON) check 



Commit de0a4148 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: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 857001f0

drivers/net/ethernet/broadcom/tg3.c

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)

 * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)

 * Copyright (C) 2004 Sun Microsystems Inc.

 * Copyright (C) 2005-2012 Broadcom Corporation.

 * Copyright (C) 2005-2013 Broadcom Corporation.

 *

 * Firmware is:

 *	Derived from proprietary unpublished source code,
@@ -93,10 +93,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits) 


#define DRV_MODULE_NAME		"tg3"

#define TG3_MAJ_NUM			3

#define TG3_MIN_NUM			128

#define TG3_MIN_NUM			129

#define DRV_MODULE_VERSION	\

	__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)

#define DRV_MODULE_RELDATE	"December 03, 2012"

#define DRV_MODULE_RELDATE	"January 06, 2013"



#define RESET_KIND_SHUTDOWN	0

#define RESET_KIND_INIT		1

drivers/net/ethernet/broadcom/tg3.h

+1 −3
Original line number Diff line number Diff line
@@ -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;

};