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

Pull CRIS changes from Jesper Nilsson:
 "Removal of some unused code from the CRIS port"

* tag 'cris-for-linus-3.7' of git://jni.nu/cris:
  CRIS: Remove VCS simulator specific code
  cris/PCI: remove pcibios_assign_resources()

2 files changed, 0 insertions, 54 deletions

diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index b34438e026be..1b6ad6247204 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -329,7 +329,6 @@ static int __init init_axis_flash(void)
         }
 #endif
 
-#ifndef CONFIG_ETRAX_VCS_SIM
         main_mtd = flash_probe();
         if (main_mtd)
                 printk(KERN_INFO "%s: 0x%08x bytes of NOR flash memory.\n",
@@ -603,34 +602,7 @@ static int __init init_axis_flash(void)
                                         "partition %d\n", part);
                 }
         }
-#endif /* CONFIG_EXTRAX_VCS_SIM */
 
-#ifdef CONFIG_ETRAX_VCS_SIM
-        /* For simulator, always use a RAM partition.
-         * The rootfs will be found after the kernel in RAM,
-         * with romfs_start and romfs_end indicating location and size.
-         */
-        struct mtd_info *mtd_ram;
-
-        mtd_ram = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
-        if (!mtd_ram) {
-                panic("axisflashmap: Couldn't allocate memory for "
-                      "mtd_info!\n");
-        }
-
-        printk(KERN_INFO "axisflashmap: Adding RAM partition for romfs, "
-               "at %u, size %u\n",
-               (unsigned) romfs_start, (unsigned) romfs_length);
-
-        err = mtdram_init_device(mtd_ram, (void *)romfs_start,
-                                 romfs_length, "romfs");
-        if (err) {
-                panic("axisflashmap: Could not initialize MTD RAM "
-                      "device!\n");
-        }
-#endif /* CONFIG_EXTRAX_VCS_SIM */
-
-#ifndef CONFIG_ETRAX_VCS_SIM
         if (aux_mtd) {
                 aux_partition.size = aux_mtd->size;
                 err = mtd_device_register(aux_mtd, &aux_partition, 1);
@@ -639,7 +611,6 @@ static int __init init_axis_flash(void)
                               "aux mtd device!\n");
 
         }
-#endif /* CONFIG_EXTRAX_VCS_SIM */
 
         return err;
 }
diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c
index 5b1ee82f63c5..e3dfc72d0cfd 100644
--- a/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@ -97,28 +97,3 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
                 pcibios_enable_irq(dev);
         return 0;
 }
-
-int pcibios_assign_resources(void)
-{
-        struct pci_dev *dev = NULL;
-        int idx;
-        struct resource *r;
-
-        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-                int class = dev->class >> 8;
-
-                /* Don't touch classless devices and host bridges */
-                if (!class || class == PCI_CLASS_BRIDGE_HOST)
-                        continue;
-
-                for(idx=0; idx<6; idx++) {
-                        r = &dev->resource[idx];
-
-                        if (!r->start && r->end)
-                                pci_assign_resource(dev, idx);
-                }
-        }
-        return 0;
-}
-
-EXPORT_SYMBOL(pcibios_assign_resources);