Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
35f349ee
Commit
35f349ee
authored
Dec 31, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-serial
parents
82c9df82
f02aa3f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
drivers/serial/pxa.c
drivers/serial/pxa.c
+2
-2
No files found.
drivers/serial/pxa.c
View file @
35f349ee
...
@@ -361,7 +361,7 @@ static int serial_pxa_startup(struct uart_port *port)
...
@@ -361,7 +361,7 @@ static int serial_pxa_startup(struct uart_port *port)
if
(
port
->
line
==
3
)
/* HWUART */
if
(
port
->
line
==
3
)
/* HWUART */
up
->
mcr
|=
UART_MCR_AFE
;
up
->
mcr
|=
UART_MCR_AFE
;
else
else
up
->
mcr
=
0
;
up
->
mcr
=
0
;
/*
/*
* Allocate the IRQ
* Allocate the IRQ
...
@@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
...
@@ -641,7 +641,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
int
i
;
int
i
;
/*
/*
* First save the
U
ER then disable the interrupts
* First save the
I
ER then disable the interrupts
*/
*/
ier
=
serial_in
(
up
,
UART_IER
);
ier
=
serial_in
(
up
,
UART_IER
);
serial_out
(
up
,
UART_IER
,
UART_IER_UUE
);
serial_out
(
up
,
UART_IER
,
UART_IER_UUE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment