PATCH 2.4.6.9: pci_set_power_state stub defined twice

PATCH 2.4.6.9: pci_set_power_state stub defined twice

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

Seems both Patrick and my change went in, presumeably breaking the
compile for !CONFIG_PCI folks including pci.h.
-- 
Jeff Garzik      | "I respect faith, but doubt is
Building 1024    |  what gives you an education."
MandrakeSoft     |           -- Wilson Mizner

[-- Attachment #2: pci.patch --]
[-- Type: text/plain, Size: 860 bytes --]

Index: include/linux/pci.h
===================================================================
RCS file: /cvsroot/gkernel/linux_2_4/include/linux/pci.h,v
retrieving revision 1.2
diff -u -r1.2 pci.h
--- include/linux/pci.h	2001/07/02 13:39:28	1.2
+++ include/linux/pci.h	2001/07/03 10:15:32
@@ -642,7 +642,6 @@
 static inline void pci_disable_device(struct pci_dev *dev) { }
 static inline int pci_module_init(struct pci_driver *drv) { return -ENODEV; }
 static inline int pci_set_dma_mask(struct pci_dev *dev, dma_addr_t mask) { return -EIO; }
-static inline int pci_set_power_state(struct pci_dev *dev, int state) { return 0; }
 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) { }