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 branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
[pandora-kernel.git]
/
drivers
/
misc
/
ibmasm
/
uart.c
diff --git
a/drivers/misc/ibmasm/uart.c
b/drivers/misc/ibmasm/uart.c
index
7e98434
..
9783caf
100644
(file)
--- a/
drivers/misc/ibmasm/uart.c
+++ b/
drivers/misc/ibmasm/uart.c
@@
-50,7
+50,7
@@
void ibmasm_register_uart(struct service_processor *sp)
memset(&uport, 0, sizeof(struct uart_port));
uport.irq = sp->irq;
uport.uartclk = 3686400;
- uport.flags = UPF_
AUTOPROBE | UPF_
SHARE_IRQ;
+ uport.flags = UPF_SHARE_IRQ;
uport.iotype = UPIO_MEM;
uport.membase = iomem_base;