pre2.3.41-4 fails compile (ide.c) i486 w/no pci

[Alan Cox]

> pre2.3.41-4 on i486 with no pci bus.
> 
> gcc -D__KERNEL__ -I/usr/src/linux-2.3.41/include -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer  -pipe -fno-strength-reduce  -DCPU=486 -m486   -DEXPORT_SYMTAB -c ide.c
> In file included from ide.c:143:
> /usr/src/linux-2.3.41/include/linux/pci.h:557: conflicting types for `pci_find_device'
> /usr/src/linux-2.3.41/include/linux/pci.h:475: previous declaration of `pci_find_device'

Someone forgot to update all of pci.h for const I think: try


--- include/linux/pci.h~	Wed Jan 26 15:53:29 2000
+++ include/linux/pci.h	Fri Jan 28 11:41:41 2000
@@ -548,17 +548,17 @@
 _PCI_NOP_ALL(read, *)
 _PCI_NOP_ALL(write,)
 
-extern inline struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, struct pci_dev *from)
+extern inline struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, const struct pci_dev *from)
 { return NULL; }
 
-extern inline struct pci_dev *pci_find_class(unsigned int class, struct pci_dev *from)
+extern inline struct pci_dev *pci_find_class(unsigned int class, const struct pci_dev *from)
 { return NULL; }
 
 extern inline struct pci_dev *pci_find_slot(unsigned int bus, unsigned int devfn)
 { return NULL; }
 
 extern inline struct pci_dev *pci_find_subsys(unsigned int vendor, unsigned int device,
-unsigned int ss_vendor, unsigned int ss_device, struct pci_dev *from)
+unsigned int ss_vendor, unsigned int ss_device, const struct pci_dev *from)
 { return NULL; }
 
 extern inline void pci_set_master(struct pci_dev *dev) { }

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo en vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/