patch-2.3.16 linux/drivers/block/cy82c693.c

Next file: linux/drivers/block/genhd.c
Previous file: linux/drivers/block/cmos-probe.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/drivers/block/cy82c693.c linux/drivers/block/cy82c693.c
@@ -369,6 +369,17 @@
 /*
  * this function is called during init and is used to setup the cy82c693 chip
  */
+/*
+ * FIXME! "pci_init_cy82c693" really should replace
+ * the "init_cy82c693_chip", it is the correct location to tinker/setup
+ * the device prior to INIT.
+ */
+
+unsigned int __init pci_init_cy82c693(struct pci_dev *dev, const char *name)
+{
+	return 0;
+}
+
 static void init_cy82c693_chip (struct pci_dev *dev)
 {
 	static int initDone = 0;
@@ -420,7 +431,7 @@
 /*
  * the init function - called for each ide channel once
  */
-__initfunc(void ide_init_cy82c693(ide_hwif_t *hwif))
+void __init ide_init_cy82c693(ide_hwif_t *hwif)
 {
 	hwif->chipset = ide_cy82c693;
 	if (hwif->dma_base)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)