diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /drivers/ata/pata_it821x.c | |
parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) |
Merge branch 'linus' into sched/devel
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 | ||