diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/net/sfc/falcon_hwdefs.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/net/sfc/falcon_hwdefs.h')
| -rw-r--r-- | drivers/net/sfc/falcon_hwdefs.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/net/sfc/falcon_hwdefs.h b/drivers/net/sfc/falcon_hwdefs.h index 0485a63eaff6..06e2d68fc3d1 100644 --- a/drivers/net/sfc/falcon_hwdefs.h +++ b/drivers/net/sfc/falcon_hwdefs.h | |||
| @@ -636,6 +636,14 @@ | |||
| 636 | #define XX_HIDRVA_WIDTH 1 | 636 | #define XX_HIDRVA_WIDTH 1 |
| 637 | #define XX_LODRVA_LBN 8 | 637 | #define XX_LODRVA_LBN 8 |
| 638 | #define XX_LODRVA_WIDTH 1 | 638 | #define XX_LODRVA_WIDTH 1 |
| 639 | #define XX_LPBKD_LBN 3 | ||
| 640 | #define XX_LPBKD_WIDTH 1 | ||
| 641 | #define XX_LPBKC_LBN 2 | ||
| 642 | #define XX_LPBKC_WIDTH 1 | ||
| 643 | #define XX_LPBKB_LBN 1 | ||
| 644 | #define XX_LPBKB_WIDTH 1 | ||
| 645 | #define XX_LPBKA_LBN 0 | ||
| 646 | #define XX_LPBKA_WIDTH 1 | ||
| 639 | 647 | ||
| 640 | #define XX_TXDRV_CTL_REG_MAC 0x12 | 648 | #define XX_TXDRV_CTL_REG_MAC 0x12 |
| 641 | #define XX_DEQD_LBN 28 | 649 | #define XX_DEQD_LBN 28 |
| @@ -656,8 +664,14 @@ | |||
| 656 | #define XX_DTXA_WIDTH 4 | 664 | #define XX_DTXA_WIDTH 4 |
| 657 | 665 | ||
| 658 | /* XAUI XGXS core status register */ | 666 | /* XAUI XGXS core status register */ |
| 659 | #define XX_FORCE_SIG_DECODE_FORCED 0xff | ||
| 660 | #define XX_CORE_STAT_REG_MAC 0x16 | 667 | #define XX_CORE_STAT_REG_MAC 0x16 |
| 668 | #define XX_FORCE_SIG_LBN 24 | ||
| 669 | #define XX_FORCE_SIG_WIDTH 8 | ||
| 670 | #define XX_FORCE_SIG_DECODE_FORCED 0xff | ||
| 671 | #define XX_XGXS_LB_EN_LBN 23 | ||
| 672 | #define XX_XGXS_LB_EN_WIDTH 1 | ||
| 673 | #define XX_XGMII_LB_EN_LBN 22 | ||
| 674 | #define XX_XGMII_LB_EN_WIDTH 1 | ||
| 661 | #define XX_ALIGN_DONE_LBN 20 | 675 | #define XX_ALIGN_DONE_LBN 20 |
| 662 | #define XX_ALIGN_DONE_WIDTH 1 | 676 | #define XX_ALIGN_DONE_WIDTH 1 |
| 663 | #define XX_SYNC_STAT_LBN 16 | 677 | #define XX_SYNC_STAT_LBN 16 |