xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c
This commit is contained in:
David S. Miller
2010-06-06 17:42:02 -07:00
parent e59d44df46 024a07bacf
commit eedc765ca4
49 changed files with 324 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/sfc/net_driver.h
View File

@@ -836,7 +836,7 @@ static inline const char *efx_dev_name(struct efx_nic *efx)
static inline unsigned int efx_port_num(struct efx_nic *efx)
{
return efx->port_num;
return efx->net_dev->dev_id;
}
/**