diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/eisa/eisa.ids | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/eisa/eisa.ids')
| -rw-r--r-- | drivers/eisa/eisa.ids | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/eisa/eisa.ids b/drivers/eisa/eisa.ids index ed69837d8b74..6cbb7a514436 100644 --- a/drivers/eisa/eisa.ids +++ b/drivers/eisa/eisa.ids | |||
| @@ -1140,6 +1140,11 @@ NON0301 "c't Universale Graphic Adapter" | |||
| 1140 | NON0401 "c't Universal Ethernet Adapter" | 1140 | NON0401 "c't Universal Ethernet Adapter" |
| 1141 | NON0501 "c't Universal 16-Bit Sound Adapter" | 1141 | NON0501 "c't Universal 16-Bit Sound Adapter" |
| 1142 | NON0601 "c't Universal 8-Bit Adapter" | 1142 | NON0601 "c't Universal 8-Bit Adapter" |
| 1143 | NPI0120 "Network Peripherals NP-EISA-1 FDDI Interface" | ||
| 1144 | NPI0221 "Network Peripherals NP-EISA-2 FDDI Interface" | ||
| 1145 | NPI0223 "Network Peripherals NP-EISA-2E Enhanced FDDI Interface" | ||
| 1146 | NPI0301 "Network Peripherals NP-EISA-3 FDDI Interface" | ||
| 1147 | NPI0303 "Network Peripherals NP-EISA-3E Enhanced FDDI Interface" | ||
| 1143 | NSS0011 "Newport Systems Solutions WNIC Adapter" | 1148 | NSS0011 "Newport Systems Solutions WNIC Adapter" |
| 1144 | NVL0701 "Novell NE3200 Bus Master Ethernet" | 1149 | NVL0701 "Novell NE3200 Bus Master Ethernet" |
| 1145 | NVL0702 "Novell NE3200T Bus Master Ethernet" | 1150 | NVL0702 "Novell NE3200T Bus Master Ethernet" |