diff options
author | David S. Miller <davem@davemloft.net> | 2013-05-30 19:52:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-30 19:52:47 -0400 |
commit | cafe89024bd0b1bd088f4c539bcc980cb37c7ce5 (patch) | |
tree | 06c382231dea71a60081b253087e998db608ea02 /drivers/net/ethernet/xilinx/xilinx_emaclite.c | |
parent | a230e033845853ebcfd21aae7a019a5392ebd30e (diff) | |
parent | 90648153754cc1ca2eb08cd19c7b13354a795183 (diff) |
Merge branch 'netxen_nic'
Manish Chopra says:
====================
This patch series includes following changes:
* Log driver version information with firmware version information.
* Log "Unknown" adapter name and serial number in case of
mismatched adapter type.
* netxen_setup_intr() function code cleanup and changes to avoid attaching
of multiple pci functions on an adapter with mixed interrupts mode
[MSI-X/MSI + INTx].
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx/xilinx_emaclite.c')
0 files changed, 0 insertions, 0 deletions