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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
serial.c
diff --git
a/arch/arm/mach-omap2/serial.c
b/arch/arm/mach-omap2/serial.c
index
302da74
..
32e91a9
100644
(file)
--- a/
arch/arm/mach-omap2/serial.c
+++ b/
arch/arm/mach-omap2/serial.c
@@
-812,7
+812,7
@@
void __init omap_serial_init_port(struct omap_board_data *bdata)
oh->dev_attr = uart;
oh->dev_attr = uart;
-
acquire_console_sem
(); /* in case the earlycon is on the UART */
+
console_lock
(); /* in case the earlycon is on the UART */
/*
* Because of early UART probing, UART did not get idled
/*
* Because of early UART probing, UART did not get idled
@@
-838,7
+838,7
@@
void __init omap_serial_init_port(struct omap_board_data *bdata)
omap_uart_block_sleep(uart);
uart->timeout = DEFAULT_TIMEOUT;
omap_uart_block_sleep(uart);
uart->timeout = DEFAULT_TIMEOUT;
-
release_console_sem
();
+
console_unlock
();
if ((cpu_is_omap34xx() && uart->padconf) ||
(uart->wk_en && uart->wk_mask)) {
if ((cpu_is_omap34xx() && uart->padconf) ||
(uart->wk_en && uart->wk_mask)) {