diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
tree | a96c26a370beb23282a561ddd936e5d0aa93adde /drivers/ide/pci/sl82c105.c | |
parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/ide/pci/sl82c105.c')
-rw-r--r-- | drivers/ide/pci/sl82c105.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index 1d970a0de21a..ea0806c82be0 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c | |||
@@ -386,7 +386,7 @@ static unsigned int sl82c105_bridge_revision(struct pci_dev *dev) | |||
386 | * channel 0 here at least, but channel 1 has to be enabled by | 386 | * channel 0 here at least, but channel 1 has to be enabled by |
387 | * firmware or arch code. We still set both to 16 bits mode. | 387 | * firmware or arch code. We still set both to 16 bits mode. |
388 | */ | 388 | */ |
389 | static unsigned int __init init_chipset_sl82c105(struct pci_dev *dev, const char *msg) | 389 | static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev, const char *msg) |
390 | { | 390 | { |
391 | u32 val; | 391 | u32 val; |
392 | 392 | ||
@@ -399,7 +399,7 @@ static unsigned int __init init_chipset_sl82c105(struct pci_dev *dev, const char | |||
399 | return dev->irq; | 399 | return dev->irq; |
400 | } | 400 | } |
401 | 401 | ||
402 | static void __init init_dma_sl82c105(ide_hwif_t *hwif, unsigned long dma_base) | 402 | static void __devinit init_dma_sl82c105(ide_hwif_t *hwif, unsigned long dma_base) |
403 | { | 403 | { |
404 | unsigned int rev; | 404 | unsigned int rev; |
405 | u8 dma_state; | 405 | u8 dma_state; |
@@ -431,7 +431,7 @@ static void __init init_dma_sl82c105(ide_hwif_t *hwif, unsigned long dma_base) | |||
431 | * Initialise the chip | 431 | * Initialise the chip |
432 | */ | 432 | */ |
433 | 433 | ||
434 | static void __init init_hwif_sl82c105(ide_hwif_t *hwif) | 434 | static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif) |
435 | { | 435 | { |
436 | struct pci_dev *dev = hwif->pci_dev; | 436 | struct pci_dev *dev = hwif->pci_dev; |
437 | u32 val; | 437 | u32 val; |