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/slc90e66.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/slc90e66.c')
| -rw-r--r-- | drivers/ide/pci/slc90e66.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 7fbf36342f73..5112c726633b 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
| @@ -196,7 +196,7 @@ fast_ata_pio: | |||
| 196 | } | 196 | } |
| 197 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | 197 | #endif /* CONFIG_BLK_DEV_IDEDMA */ |
| 198 | 198 | ||
| 199 | static void __init init_hwif_slc90e66 (ide_hwif_t *hwif) | 199 | static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) |
| 200 | { | 200 | { |
| 201 | u8 reg47 = 0; | 201 | u8 reg47 = 0; |
| 202 | u8 mask = hwif->channel ? 0x01 : 0x02; /* bit0:Primary */ | 202 | u8 mask = hwif->channel ? 0x01 : 0x02; /* bit0:Primary */ |