From 220f1a5d7a40f30a45b67ff477eee5394e3bd4df Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 13 Feb 2008 23:30:12 +0200 Subject: [PATCH] --- yaml --- r: 91661 b: refs/heads/master c: 2baad5f96b498812626eadb6f6af3eb41d8656a3 h: refs/heads/master i: 91659: cd0a01ebd267a057c987fac87944ddbf4b345899 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-res.c | 2 +- trunk/include/linux/pci.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd810a973a6e..1f51ba98fe94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b5ff469234b8ab5cd05f4a201cbb229896729d0 +refs/heads/master: 2baad5f96b498812626eadb6f6af3eb41d8656a3 diff --git a/trunk/drivers/pci/setup-res.c b/trunk/drivers/pci/setup-res.c index 4be7ccf7e3ae..9e4d485ba9cd 100644 --- a/trunk/drivers/pci/setup-res.c +++ b/trunk/drivers/pci/setup-res.c @@ -171,7 +171,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) return ret; } -#ifdef CONFIG_EMBEDDED +#if 0 int pci_assign_resource_fixed(struct pci_dev *dev, int resno) { struct pci_bus *bus = dev->bus; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index ea760e519c46..3a2b9fbdb379 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -601,7 +601,6 @@ int pcie_get_readrq(struct pci_dev *dev); int pcie_set_readrq(struct pci_dev *dev, int rq); void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno); int __must_check pci_assign_resource(struct pci_dev *dev, int i); -int __must_check pci_assign_resource_fixed(struct pci_dev *dev, int i); int pci_select_bars(struct pci_dev *dev, unsigned long flags); /* ROM control related routines */