summaryrefslogtreecommitdiff
path: root/drivers/net/netxen/netxen_nic_hdr.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-06 06:06:45 +0400
committerDavid S. Miller <davem@davemloft.net>2009-07-06 06:06:45 +0400
commit6b1344724e10c166d9e3c17011ed879ddf302e94 (patch)
treebbfa98b183c1249a58ad2debdb696392d8c4a029 /drivers/net/netxen/netxen_nic_hdr.h
parent8e4a718ff38d8539938ec3421935904c27e00c39 (diff)
parent1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff)
downloadlinux-6b1344724e10c166d9e3c17011ed879ddf302e94.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hdr.h')
-rw-r--r--drivers/net/netxen/netxen_nic_hdr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 3cc047844af3..824103675648 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -853,6 +853,7 @@ enum {
#define NX_PEG_TUNE_CAPABILITY (NETXEN_CAM_RAM(0x02c))
#define NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL (0x14)
+#define NETXEN_PEG_ALIVE_COUNTER (NETXEN_CAM_RAM(0xb0))
#define ISR_MSI_INT_TRIGGER(FUNC) (NETXEN_PCIX_PS_REG(PCIX_MSI_F(FUNC)))
#define ISR_LEGACY_INT_TRIGGERED(VAL) (((VAL) & 0x300) == 0x200)