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()

diff --combined arch/cris/Kconfig
index e92215428a37e315d0b5df9f962df8e4c8090dcc,ca038afb8b5bd78d167df8bf602177ad79419532..72bd5ae50a890fd1fda0afe419553cf631bd2f2e
--- 1/arch/cris/Kconfig
--- 2/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@@ -42,7 -42,6 +42,7 @@@ config CRI
        select HAVE_IDE
        select GENERIC_ATOMIC64
        select HAVE_GENERIC_HARDIRQS
 +      select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
        select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
@@@ -138,11 -137,6 +138,6 @@@ config CRIS_MACH_ARTPEC
  
  endchoice
  
- config ETRAX_VCS_SIM
-       bool "VCS Simulator"
-       help
-         Setup hardware to be run in the VCS simulator.
- 
  config ETRAX_ARCH_V10
         bool
         default y if ETRAX100LX || ETRAX100LX_V2

diff --combined arch/cris/arch-v32/drivers/pci/bios.c
index 5b1ee82f63c5452750caf791fff3bd975c6d9c6a,f748cedfa191c1201cae9284c9968ee21af501c8..e3dfc72d0cfd760507f42ea74355511aa134c16d
--- 1/arch/cris/arch-v32/drivers/pci/bios.c
--- 2/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/arch/cris/arch-v32/drivers/pci/bios.c
@@@ -6,6 -6,11 +6,6 @@@ void __devinit  pcibios_fixup_bus(struc
  {
  }
  
 -char * __devinit  pcibios_setup(char *str)
 -{
 -      return NULL;
 -}
 -
  void pcibios_set_master(struct pci_dev *dev)
  {
        u8 lat;
@@@ -97,28 -102,3 +97,3 @@@ int pcibios_enable_device(struct pci_de
                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);