diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:53:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 17:53:20 +0200 |
commit | c3d1f1746b966907ba5ad2f75ddca24db8b21147 (patch) | |
tree | 548a25e104d8bdb906030b8d3bf78fbfde0e5817 /arch/mips/dec/promcon.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 (diff) | |
parent | MIPS: PowerTV: Separate PowerTV USB support from non-USB code (diff) | |
download | linux-c3d1f1746b966907ba5ad2f75ddca24db8b21147.tar.xz linux-c3d1f1746b966907ba5ad2f75ddca24db8b21147.zip |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
MIPS: PowerTV: Separate PowerTV USB support from non-USB code
MIPS: strip the un-needed sections of vmlinuz
MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
MIPS: Clean up arch/mips/boot/compressed/decompress.c
MIPS: Clean up arch/mips/boot/compressed/ld.script
MIPS: Unify the suffix of compressed vmlinux.bin
MIPS: PowerTV: Add Gaia platform definitions.
MIPS: BCM47xx: Fix nvram_getenv return value.
MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
MIPS: Clean up notify_die() usage.
MIPS: Remove unused task_struct.trap_no field.
Documentation: Mention that KProbes is supported on MIPS
SAMPLES: kprobe_example: Make it print something on MIPS.
MIPS: kprobe: Add support.
MIPS: Add instrunction format for BREAK and SYSCALL
MIPS: kprobes: Define regs_return_value()
MIPS: Ritually kill stupid printk.
MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
MIPS: Octeon: Support 256 MSI on PCIe
MIPS: Decode core number for R2 CPUs.
...
Diffstat (limited to 'arch/mips/dec/promcon.c')
-rw-r--r-- | arch/mips/dec/promcon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/dec/promcon.c b/arch/mips/dec/promcon.c index 9f0972f5a702..c239c25b79ff 100644 --- a/arch/mips/dec/promcon.c +++ b/arch/mips/dec/promcon.c @@ -33,8 +33,7 @@ static int __init prom_console_setup(struct console *co, char *options) return 0; } -static struct console sercons = -{ +static struct console sercons = { .name = "ttyS", .write = prom_console_write, .setup = prom_console_setup, |