git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip32
/
ip32-setup.c
diff --git
a/arch/mips/sgi-ip32/ip32-setup.c
b/arch/mips/sgi-ip32/ip32-setup.c
index
2c38770
..
2f50c79
100644
(file)
--- a/
arch/mips/sgi-ip32/ip32-setup.c
+++ b/
arch/mips/sgi-ip32/ip32-setup.c
@@
-98,7
+98,7
@@
void __init plat_setup(void)
board_timer_setup = ip32_timer_setup;
#ifdef CONFIG_SERIAL_8250
- {
+ {
static struct uart_port o2_serial[2];
memset(o2_serial, 0, sizeof(o2_serial));