From 469748b501e058d4dff99c79cd8cfd1aa89a56d2 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sun, 3 Jul 2005 16:25:46 +0200 Subject: [PATCH] --- yaml --- r: 4067 b: refs/heads/master c: ddbc9fb47252f9b6966bfe9b0aa27bfeaa585cca h: refs/heads/master i: 4065: 76de1ba83846c5efb54f3c49c6f73a8d30858221 4063: 4a6b452e4e83e07560f4510bf11874c0ed5f629b v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/cy82c693.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b74a72e59034..a7386b212cfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88de8e996f16b958721368ed9b4fd4e29cdb923e +refs/heads/master: ddbc9fb47252f9b6966bfe9b0aa27bfeaa585cca diff --git a/trunk/drivers/ide/pci/cy82c693.c b/trunk/drivers/ide/pci/cy82c693.c index 80d67e99ccb5..5a33513f3dd1 100644 --- a/trunk/drivers/ide/pci/cy82c693.c +++ b/trunk/drivers/ide/pci/cy82c693.c @@ -391,7 +391,7 @@ static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio) /* * this function is called during init and is used to setup the cy82c693 chip */ -static unsigned int __init init_chipset_cy82c693(struct pci_dev *dev, const char *name) +static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const char *name) { if (PCI_FUNC(dev->devfn) != 1) return 0; @@ -443,7 +443,7 @@ static unsigned int __init init_chipset_cy82c693(struct pci_dev *dev, const char /* * the init function - called for each ide channel once */ -static void __init init_hwif_cy82c693(ide_hwif_t *hwif) +static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif) { hwif->autodma = 0; @@ -467,9 +467,9 @@ static void __init init_hwif_cy82c693(ide_hwif_t *hwif) hwif->drives[1].autodma = hwif->autodma; } -static __initdata ide_hwif_t *primary; +static __devinitdata ide_hwif_t *primary; -void __init init_iops_cy82c693(ide_hwif_t *hwif) +void __devinit init_iops_cy82c693(ide_hwif_t *hwif) { if (PCI_FUNC(hwif->pci_dev->devfn) == 1) primary = hwif;