diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /drivers/ide/pci/triflex.c | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'drivers/ide/pci/triflex.c')
| -rw-r--r-- | drivers/ide/pci/triflex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index a1df2bfe3631..f96b56838f33 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c | |||
| @@ -130,7 +130,7 @@ static int triflex_config_drive_xfer_rate(ide_drive_t *drive) | |||
| 130 | return hwif->ide_dma_off_quietly(drive); | 130 | return hwif->ide_dma_off_quietly(drive); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | static void __init init_hwif_triflex(ide_hwif_t *hwif) | 133 | static void __devinit init_hwif_triflex(ide_hwif_t *hwif) |
| 134 | { | 134 | { |
| 135 | hwif->tuneproc = &triflex_tune_drive; | 135 | hwif->tuneproc = &triflex_tune_drive; |
| 136 | hwif->speedproc = &triflex_tune_chipset; | 136 | hwif->speedproc = &triflex_tune_chipset; |