diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/ide/pci/sc1200.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/ide/pci/sc1200.c')
| -rw-r--r-- | drivers/ide/pci/sc1200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 3bc3bf1be49b..10592cec6c43 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
| @@ -459,7 +459,7 @@ printk("%s: SC1200: resume\n", hwif->name); | |||
| 459 | * This gets invoked by the IDE driver once for each channel, | 459 | * This gets invoked by the IDE driver once for each channel, |
| 460 | * and performs channel-specific pre-initialization before drive probing. | 460 | * and performs channel-specific pre-initialization before drive probing. |
| 461 | */ | 461 | */ |
| 462 | static void __init init_hwif_sc1200 (ide_hwif_t *hwif) | 462 | static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif) |
| 463 | { | 463 | { |
| 464 | if (hwif->mate) | 464 | if (hwif->mate) |
| 465 | hwif->serialized = hwif->mate->serialized = 1; | 465 | hwif->serialized = hwif->mate->serialized = 1; |