diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 21:14:39 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-03 21:14:39 +0100 |
| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 (patch) | |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 /drivers/scsi/bnx2i/bnx2i.h | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 (diff) | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff) | |
| download | blackbird-op-linux-2058297d2d045cb57138c33b87cfabcc80e65186.tar.gz blackbird-op-linux-2058297d2d045cb57138c33b87cfabcc80e65186.zip | |
Merge branch 'for-linus' into for-2.6.33
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi/bnx2i/bnx2i.h')
| -rw-r--r-- | drivers/scsi/bnx2i/bnx2i.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h index d7576f28c6e9..5edde1a8c04d 100644 --- a/drivers/scsi/bnx2i/bnx2i.h +++ b/drivers/scsi/bnx2i/bnx2i.h @@ -100,6 +100,8 @@ #define CTX_OFFSET 0x10000 #define MAX_CID_CNT 0x4000 +#define BNX2I_570X_PAGE_SIZE_DEFAULT 4096 + /* 5709 context registers */ #define BNX2_MQ_CONFIG2 0x00003d00 #define BNX2_MQ_CONFIG2_CONT_SZ (0x7L<<4) |
