Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
69454e69
Commit
69454e69
authored
Feb 17, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-serial
parents
a5222049
dc7bf130
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/serial/8250.c
drivers/serial/8250.c
+1
-1
drivers/serial/Kconfig
drivers/serial/Kconfig
+2
-2
No files found.
drivers/serial/8250.c
View file @
69454e69
...
@@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
...
@@ -2198,7 +2198,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
touch_nmi_watchdog
();
touch_nmi_watchdog
();
/*
/*
* 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
);
...
...
drivers/serial/Kconfig
View file @
69454e69
...
@@ -902,8 +902,8 @@ config SERIAL_JSM
...
@@ -902,8 +902,8 @@ config SERIAL_JSM
something like this to connect more than two modems to your Linux
something like this to connect more than two modems to your Linux
box, for instance in order to become a dial-in server. This driver
box, for instance in order to become a dial-in server. This driver
supports PCI boards only.
supports PCI boards only.
If you have a card like this, say Y here and read the file
<file:Documentation/jsm.txt>
.
If you have a card like this, say Y here, otherwise say N
.
To compile this driver as a module, choose M here: the
To compile this driver as a module, choose M here: the
module will be called jsm.
module will be called jsm.
...
...
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