diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 11:22:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 11:22:33 -0400 |
| commit | a7b354e868bc2f887dfb0a418aa7d96df1afc399 (patch) | |
| tree | 7f07d314a3a0177daab9b54d78ded0c4f9e412e0 /drivers/ata/pata_it821x.c | |
| parent | f7edd5fbde8af44fa06218f56e0f648fc7a527c8 (diff) | |
| parent | 4ef281853474389fea952e9e59650e599ecf2d62 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_it821x: fix warning
libata: Fix a large collection of DMA mode mismatches
ahci: sis controllers actually can do PMP
pata_via: clean up recent tf_load changes
libata: restore SControl on detach
libata: use ata_link_printk() when printing SError
libata: always do follow-up SRST if hardreset returned -EAGAIN
libata: fix EH action overwriting in ata_eh_reset()
sata_mv: add the Gen IIE flag to the SoC devices.
ata_piix: IDE Mode SATA patch for Intel Ibex Peak DeviceIDs
ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
sata_mv: don't issue two DMA commands concurrently
libata: implement no[hs]rst force params
Diffstat (limited to 'drivers/ata/pata_it821x.c')
| -rw-r--r-- | drivers/ata/pata_it821x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 27843c70eb9d..0221c9a46769 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -606,7 +606,7 @@ static void it821x_display_disk(int n, u8 *buf) | |||
| 606 | { | 606 | { |
| 607 | unsigned char id[41]; | 607 | unsigned char id[41]; |
| 608 | int mode = 0; | 608 | int mode = 0; |
| 609 | char *mtype; | 609 | char *mtype = ""; |
| 610 | char mbuf[8]; | 610 | char mbuf[8]; |
| 611 | char *cbl = "(40 wire cable)"; | 611 | char *cbl = "(40 wire cable)"; |
| 612 | 612 | ||