Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris

[linux-2.6-block.git] / arch / cris / arch-v32 / drivers / pci / bios.c

diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index f748cedfa191c1201cae9284c9968ee21af501c8..e3dfc72d0cfd760507f42ea74355511aa134c16d 100644 (file)
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -6,11 +6,6 @@ void __devinit  pcibios_fixup_bus(struct pci_bus *b)
 {
 }
 
-char * __devinit  pcibios_setup(char *str)
-{
-       return NULL;
-}
-
 void pcibios_set_master(struct pci_dev *dev)
 {
        u8 lat;