diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 21:31:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 21:31:24 -0800 |
| commit | 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 (patch) | |
| tree | 5244e85d0dfb2619b0af4bc80a2c99dd579f79a5 /arch/parisc/kernel/hardware.c | |
| parent | 35d138ae22f826f95f0f8d0285947582ccf4508f (diff) | |
| parent | 58b6c58caef7a34eab7ec887288fa495696653e7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'arch/parisc/kernel/hardware.c')
| -rw-r--r-- | arch/parisc/kernel/hardware.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c index 2071b5bba15..3058bffd8a2 100644 --- a/arch/parisc/kernel/hardware.c +++ b/arch/parisc/kernel/hardware.c @@ -551,6 +551,7 @@ static struct hp_hardware hp_hardware_list[] __initdata = { {HPHW_BCPORT, 0x804, 0x0000C, 0x10, "REO I/O BC Merced Port"}, {HPHW_BCPORT, 0x782, 0x0000C, 0x00, "REO I/O BC Ropes Port"}, {HPHW_BCPORT, 0x784, 0x0000C, 0x00, "Pluto I/O BC Ropes Port"}, + {HPHW_BRIDGE, 0x05D, 0x0000A, 0x00, "SummitHawk Dino PCI Bridge"}, {HPHW_BRIDGE, 0x680, 0x0000A, 0x00, "Dino PCI Bridge"}, {HPHW_BRIDGE, 0x682, 0x0000A, 0x00, "Cujo PCI Bridge"}, {HPHW_BRIDGE, 0x782, 0x0000A, 0x00, "Elroy PCI Bridge"}, |