Re: 2.5.75: parse error in pci.h if !CONFIG_PCI

[Greg KH <greg@kroah.com>]

On Sun, Jul 13, 2003 at 12:27:41PM +0200, Adrian Bunk wrote:
> I got the following compile error when trying to compile 2.5.75 with 
> !CONFIG_PCI:
> 
> <--  snip  -->
> 
> ...
>   CC      drivers/message/fusion/mptscsih.o
> In file included from drivers/message/fusion/linux_compat.h:10,
>                  from drivers/message/fusion/mptbase.h:58,
>                  from drivers/message/fusion/mptscsih.c:82:
> include/linux/pci.h:718: error: syntax error before "int"
> drivers/message/fusion/mptscsih.c:6924: warning: `mptscsih_setup' 
> defined but not used
> make[3]: *** [drivers/message/fusion/mptscsih.o] Error 1
> 
> <--  snip  -->

Thanks, the patch below should fix this problem.  I'll send it on to
Linus in a bit.

greg k-h


# PCI: fix up error for when CONFIG_PCI=n and scsi.h is included.

diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h	Sun Jul 13 23:07:44 2003
+++ b/include/linux/pci.h	Sun Jul 13 23:07:44 2003
@@ -715,7 +715,6 @@
 static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;}
 static inline int pci_register_driver(struct pci_driver *drv) { return 0;}
 static inline void pci_unregister_driver(struct pci_driver *drv) { }
-static inline int scsi_to_pci_dma_dir(unsigned char scsi_dir) { return scsi_dir; }
 static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; }
 static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; }