diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/sh/drivers/pci/ops-dreamcast.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/sh/drivers/pci/ops-dreamcast.c')
| -rw-r--r-- | arch/sh/drivers/pci/ops-dreamcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c index 381306cf5425..e1284fc69361 100644 --- a/arch/sh/drivers/pci/ops-dreamcast.c +++ b/arch/sh/drivers/pci/ops-dreamcast.c | |||
| @@ -57,7 +57,7 @@ struct pci_channel board_pci_channels[] = { | |||
| 57 | * | 57 | * |
| 58 | * Also, we could very easily support both Type 0 and Type 1 configurations | 58 | * Also, we could very easily support both Type 0 and Type 1 configurations |
| 59 | * here, but since it doesn't seem that there is any such implementation in | 59 | * here, but since it doesn't seem that there is any such implementation in |
| 60 | * existance, we don't bother. | 60 | * existence, we don't bother. |
| 61 | * | 61 | * |
| 62 | * I suppose if someone actually gets around to ripping the chip out of | 62 | * I suppose if someone actually gets around to ripping the chip out of |
| 63 | * the BBA and hanging some more devices off of it, then this might be | 63 | * the BBA and hanging some more devices off of it, then this might be |