Merge tag 'upstream-3.15-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / arch / tile / kernel / pci_gx.c

diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index a97a6452b812cdb9681d49fb4130ab3403ff3d2d..077b7bc437e5f6a54e5ad28e42e89e524001dbf0 100644 (file)
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -1064,18 +1064,6 @@ char *__init pcibios_setup(char *str)
        return str;
 }
 
-/*
- * Enable memory address decoding, as appropriate, for the
- * device described by the 'dev' struct.
- *
- * This is called from the generic PCI layer, and can be called
- * for bridges or endpoints.
- */
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-       return pci_enable_resources(dev, mask);
-}
-
 /*
  * Called for each device after PCI setup is done.
  * We initialize the PCI device capabilities conservatively, assuming that