diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/usb/storage/isd200.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/usb/storage/isd200.c')
| -rw-r--r-- | drivers/usb/storage/isd200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index 6b9982cd542..09e52ba47dd 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c | |||
| @@ -1510,7 +1510,7 @@ static int isd200_Initialization(struct us_data *us) | |||
| 1510 | * Protocol and Transport for the ISD200 ASIC | 1510 | * Protocol and Transport for the ISD200 ASIC |
| 1511 | * | 1511 | * |
| 1512 | * This protocol and transport are for ATA devices connected to an ISD200 | 1512 | * This protocol and transport are for ATA devices connected to an ISD200 |
| 1513 | * ASIC. An ATAPI device that is conected as a slave device will be | 1513 | * ASIC. An ATAPI device that is connected as a slave device will be |
| 1514 | * detected in the driver initialization function and the protocol will | 1514 | * detected in the driver initialization function and the protocol will |
| 1515 | * be changed to an ATAPI protocol (Transparent SCSI). | 1515 | * be changed to an ATAPI protocol (Transparent SCSI). |
| 1516 | * | 1516 | * |