summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2014-06-28 17:44:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-17 15:57:59 -0700
commit977efe49438cdd925c52c0bc57dbe8f718596a21 (patch)
tree3112c80cb55b81d0cd9c9a87b4ebaaa148a8ecbb /arch
parent6bb8bc508605b42fecce5daa28ea9ed682baacce (diff)
downloadlinux-3.10-977efe49438cdd925c52c0bc57dbe8f718596a21.tar.gz
linux-3.10-977efe49438cdd925c52c0bc57dbe8f718596a21.tar.bz2
linux-3.10-977efe49438cdd925c52c0bc57dbe8f718596a21.zip
parisc: add serial ports of C8000/1GHz machine to hardware database
commit eadcc7208a2237016be7bdff4551ba7614da85c8 upstream. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/kernel/hardware.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 872275659d9..c22c3d84e28 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -1205,7 +1205,8 @@ static struct hp_hardware hp_hardware_list[] = {
{HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"},
{HPHW_FIO, 0x004, 0x00340, 0x0, "BARCO CX4500 VME Grphx Cnsl"},
{HPHW_FIO, 0x004, 0x00360, 0x0, "Hughes TOG VME FDDI"},
- {HPHW_FIO, 0x076, 0x000AD, 0x00, "Crestone Peak RS-232"},
+ {HPHW_FIO, 0x076, 0x000AD, 0x0, "Crestone Peak Core RS-232"},
+ {HPHW_FIO, 0x077, 0x000AD, 0x0, "Crestone Peak Fast? Core RS-232"},
{HPHW_IOA, 0x185, 0x0000B, 0x00, "Java BC Summit Port"},
{HPHW_IOA, 0x1FF, 0x0000B, 0x00, "Hitachi Ghostview Summit Port"},
{HPHW_IOA, 0x580, 0x0000B, 0x10, "U2-IOA BC Runway Port"},