diff options
| author | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /drivers/ide/cmd64x.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/ide/cmd64x.c')
| -rw-r--r-- | drivers/ide/cmd64x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index 2f9688d87ecd..aeee036b1503 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c @@ -333,7 +333,7 @@ static int cmd646_1_dma_end(ide_drive_t *drive) return (dma_stat & 7) != 4; } -static unsigned int init_chipset_cmd64x(struct pci_dev *dev) +static int init_chipset_cmd64x(struct pci_dev *dev) { u8 mrdmode = 0; |