Merge remote-tracking branch 'microblaze/next'

Conflicts:
	arch/microblaze/pci/pci_32.c

diff --cc arch/microblaze/include/asm/prom.h
index 9bd01ecb00d69e980e0568b75a3e8b882d090b71,34c4e8b27805573d57de40c0bcec53b4ac890c85..4bfe4c882d815d76b42d1be03ab39c1482a182e8
--- 1/arch/microblaze/include/asm/prom.h
--- 2/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@@ -26,9 -26,28 +26,13 @@@
  #define HAVE_ARCH_DEVTREE_FIXUPS
  
  /* Other Prototypes */
- extern int early_uartlite_console(void);
- extern int early_uart16550_console(void);
+ enum early_consoles {
+       UARTLITE = 1,
+       UART16550 = 2,
+ };
+ 
+ extern int of_early_console(void *version);
  
 -#ifdef CONFIG_PCI
 -/*
 - * PCI <-> OF matching functions
 - * (XXX should these be here?)
 - */
 -struct pci_bus;
 -struct pci_dev;
 -extern int pci_device_from_OF_node(struct device_node *node,
 -                                      u8 *bus, u8 *devfn);
 -extern struct device_node *pci_busdev_to_OF_node(struct pci_bus *bus,
 -                                                      int devfn);
 -extern struct device_node *pci_device_to_OF_node(struct pci_dev *dev);
 -extern void pci_create_OF_bus_map(void);
 -#endif
 -
  /*
   * OF address retreival & translation
   */