diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
commit | 57bb8587a072c8f76d8f1b1807a78add5ce0f292 (patch) | |
tree | dd0abb5a545cd4f2c4ff3fdf2449f2d413d058b9 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | |
parent | fe852b0df2ff1e5980e23b71bb08edd55e2b517e (diff) | |
parent | 4453f4fde106d53de1d8532684871b47fc735ec6 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index bdbcd2b088a0..d77845e39112 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c @@ -178,7 +178,7 @@ const u32 qlcnic_83xx_reg_tbl[] = { 0x3540, /* Device state, DRV_REG1 */ 0x3544, /* Driver state, DRV_REG2 */ 0x3548, /* Driver scratch, DRV_REG3 */ - 0x354C, /* Device partiton info, DRV_REG4 */ + 0x354C, /* Device partition info, DRV_REG4 */ 0x3524, /* Driver IDC ver, DRV_REG5 */ 0x3550, /* FW_VER_MAJOR */ 0x3554, /* FW_VER_MINOR */ |