Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / arch / m68knommu / kernel / comempci.c

diff --git a/arch/m68knommu/kernel/comempci.c b/arch/m68knommu/kernel/comempci.c
index db7a0c1..0a68b5a 100644 (file)
--- a/arch/m68knommu/kernel/comempci.c
+++ b/arch/m68knommu/kernel/comempci.c
@@ -9,7 +9,6 @@
 
 /*****************************************************************************/
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
@@ -374,15 +373,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
        return(0);
 }
 
-/*****************************************************************************/
-
-void pcibios_update_resource(struct pci_dev *dev, struct resource *root, struct resource *r, int resource)
-{
-       printk(KERN_WARNING "%s(%d): no support for changing PCI resources...\n",
-               __FILE__, __LINE__);
-}
-
-
 /*****************************************************************************/
 
 /*