diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/qla2xxx/ql2100.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/ql2100.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/ql2100.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/ql2100.c b/drivers/scsi/qla2xxx/ql2100.c index 058733d98d6b..f5db2235e432 100644 --- a/drivers/scsi/qla2xxx/ql2100.c +++ b/drivers/scsi/qla2xxx/ql2100.c | |||
| @@ -1,11 +1,10 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * QLogic ISP2100 device driver for Linux 2.6.x | 2 | * QLogic Fibre Channel HBA Driver |
| 3 | * Copyright (C) 2003 Christoph Hellwig. | 3 | * Copyright (C) 2003 Christoph Hellwig. |
| 4 | * Copyright (C) 2003-2005 QLogic Corporation (www.qlogic.com) | 4 | * Copyright (c) 2003-2005 QLogic Corporation |
| 5 | * | 5 | * |
| 6 | * Released under GPL v2. | 6 | * See LICENSE.qla2xxx for copyright and licensing details. |
| 7 | */ | 7 | */ |
| 8 | |||
| 9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |