diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/netxen/netxen_nic_hw.c | |
parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index b24cfddd619..5026811c04c 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -750,28 +750,6 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu) | |||
750 | return rc; | 750 | return rc; |
751 | } | 751 | } |
752 | 752 | ||
753 | int netxen_is_flash_supported(struct netxen_adapter *adapter) | ||
754 | { | ||
755 | const int locs[] = { 0, 0x4, 0x100, 0x4000, 0x4128 }; | ||
756 | int addr, val01, val02, i, j; | ||
757 | |||
758 | /* if the flash size less than 4Mb, make huge war cry and die */ | ||
759 | for (j = 1; j < 4; j++) { | ||
760 | addr = j * NETXEN_NIC_WINDOW_MARGIN; | ||
761 | for (i = 0; i < ARRAY_SIZE(locs); i++) { | ||
762 | if (netxen_rom_fast_read(adapter, locs[i], &val01) == 0 | ||
763 | && netxen_rom_fast_read(adapter, (addr + locs[i]), | ||
764 | &val02) == 0) { | ||
765 | if (val01 == val02) | ||
766 | return -1; | ||
767 | } else | ||
768 | return -1; | ||
769 | } | ||
770 | } | ||
771 | |||
772 | return 0; | ||
773 | } | ||
774 | |||
775 | static int netxen_get_flash_block(struct netxen_adapter *adapter, int base, | 753 | static int netxen_get_flash_block(struct netxen_adapter *adapter, int base, |
776 | int size, __le32 * buf) | 754 | int size, __le32 * buf) |
777 | { | 755 | { |