From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2011 16:24:20 +0000 (-0700)
Subject: Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ed3689bdceb0064ee6faf0e76f6467122794970;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Do not show error message for 32 interrupt lines
  Revert "microblaze: PCI fix typo fault in of_node pointer moving into pci_bus"
  microblaze: PCI fix typo fault in of_node pointer moving into pci_bus
  microblaze: Add support for early console on mdm
  microblaze: Simplify early console binding from DT
  microblaze: Get early printk console earlier
  microblaze: Standardise cpuinfo output for cache policy
  microblaze: Unprivileged stream instruction awareness
  microblaze: trivial: Fix typo fault
  microblaze: exec: Remove redundant set_fs(USER_DS)
  microblaze: Remove duplicated prototype of start_thread()
  microblaze: Fix unaligned value saving to the stack for system with MMU
  microblaze/irqs: Do not trace arch_local_{*,irq_*} functions
---

9ed3689bdceb0064ee6faf0e76f6467122794970
diff --cc arch/microblaze/include/asm/prom.h
index 9ad567e2d425,34c4e8b27805..20c5e8e5121b
--- a/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
   */