Skip to content

L
linux
Commit f7ca566e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 2716e9f5 e01b4ffd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/serial/8250_pnp.c
View file @ f7ca566e
...@@ -250,6 +250,8 @@ static const struct pnp_device_id pnp_dev_table[] = { ...@@ -250,6 +250,8 @@ static const struct pnp_device_id pnp_dev_table[] = {
/* Kortex International */ /* Kortex International */
/* KORTEX 14400 Externe PnP */ /* KORTEX 14400 Externe PnP */
{ "ROK0100", 0 }, { "ROK0100", 0 },
/* Rockwell 28.8 */
{ "ROK4120", 0 },
/* Viking Components, Inc */ /* Viking Components, Inc */
/* Viking 28.8 INTERNAL Fax+Data+Voice PnP */ /* Viking 28.8 INTERNAL Fax+Data+Voice PnP */
{ "ROK4920", 0 }, { "ROK4920", 0 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7