diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 09:24:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 09:24:20 -0700 |
| commit | 9ed3689bdceb0064ee6faf0e76f6467122794970 (patch) | |
| tree | 059fbf494ac721faaefef1dd6e0131e9e576f6fb /arch/microblaze/include/asm/setup.h | |
| parent | 8aae36cdf12313cd9cc0e4799fe1ea64d3c623f3 (diff) | |
| parent | 363922946f96ad1d6420107ebcfa9a95b659fe75 (diff) | |
| download | talos-op-linux-9ed3689bdceb0064ee6faf0e76f6467122794970.tar.gz talos-op-linux-9ed3689bdceb0064ee6faf0e76f6467122794970.zip | |
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
Diffstat (limited to 'arch/microblaze/include/asm/setup.h')
| -rw-r--r-- | arch/microblaze/include/asm/setup.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index 8f3968971e4e..904e5ef6a11b 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h @@ -23,6 +23,7 @@ extern char cmd_line[COMMAND_LINE_SIZE]; void early_printk(const char *fmt, ...); int setup_early_printk(char *opt); +void remap_early_printk(void); void disable_early_printk(void); #if defined(CONFIG_EARLY_PRINTK) |
