diff options
-rw-r--r-- | drivers/pci/setup-res.c | 2 | ||||
-rw-r--r-- | include/linux/pci.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 4be7ccf7e3ae..9e4d485ba9cd 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -171,7 +171,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) | |||
171 | return ret; | 171 | return ret; |
172 | } | 172 | } |
173 | 173 | ||
174 | #ifdef CONFIG_EMBEDDED | 174 | #if 0 |
175 | int pci_assign_resource_fixed(struct pci_dev *dev, int resno) | 175 | int pci_assign_resource_fixed(struct pci_dev *dev, int resno) |
176 | { | 176 | { |
177 | struct pci_bus *bus = dev->bus; | 177 | struct pci_bus *bus = dev->bus; |
diff --git a/include/linux/pci.h b/include/linux/pci.h index ea760e519c46..3a2b9fbdb379 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -601,7 +601,6 @@ int pcie_get_readrq(struct pci_dev *dev); | |||
601 | int pcie_set_readrq(struct pci_dev *dev, int rq); | 601 | int pcie_set_readrq(struct pci_dev *dev, int rq); |
602 | void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); | 602 | void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); |
603 | int __must_check pci_assign_resource(struct pci_dev *dev, int i); | 603 | int __must_check pci_assign_resource(struct pci_dev *dev, int i); |
604 | int __must_check pci_assign_resource_fixed(struct pci_dev *dev, int i); | ||
605 | int pci_select_bars(struct pci_dev *dev, unsigned long flags); | 604 | int pci_select_bars(struct pci_dev *dev, unsigned long flags); |
606 | 605 | ||
607 | /* ROM control related routines */ | 606 | /* ROM control related routines */ |