diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
| commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
| tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /drivers/ide/pci/ns87415.c | |
| parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
| -rw-r--r-- | drivers/ide/pci/ns87415.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index 205a32fbc2f0..fcd5142f5cfe 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
| @@ -195,7 +195,7 @@ static int ns87415_ide_dma_check (ide_drive_t *drive) | |||
| 195 | return __ide_dma_check(drive); | 195 | return __ide_dma_check(drive); |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | static void __init init_hwif_ns87415 (ide_hwif_t *hwif) | 198 | static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) |
| 199 | { | 199 | { |
| 200 | struct pci_dev *dev = hwif->pci_dev; | 200 | struct pci_dev *dev = hwif->pci_dev; |
| 201 | unsigned int ctrl, using_inta; | 201 | unsigned int ctrl, using_inta; |