diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/scsi/fnic/fnic.h | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/scsi/fnic/fnic.h')
| -rw-r--r-- | drivers/scsi/fnic/fnic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index bb208a6091e7..3966c71d0095 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #define DRV_NAME "fnic" | 37 | #define DRV_NAME "fnic" |
| 38 | #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" | 38 | #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" |
| 39 | #define DRV_VERSION "1.0.0.1121" | 39 | #define DRV_VERSION "1.4.0.98" |
| 40 | #define PFX DRV_NAME ": " | 40 | #define PFX DRV_NAME ": " |
| 41 | #define DFX DRV_NAME "%d: " | 41 | #define DFX DRV_NAME "%d: " |
| 42 | 42 | ||