Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / parisc / kernel / hardware.c

diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 4abd439..3058bff 100644 (file)
--- 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"}, 
@@ -1296,18 +1297,18 @@ static struct hp_cpu_type_mask {
 };
 
 char *cpu_name_version[][2] = {
-       [pcx]   { "PA7000 (PCX)",       "1.0" },
-       [pcxs]  { "PA7000 (PCX-S)",     "1.1a" },
-       [pcxt]  { "PA7100 (PCX-T)",     "1.1b" },
-       [pcxt_] { "PA7200 (PCX-T')",    "1.1c" },
-       [pcxl]  { "PA7100LC (PCX-L)",   "1.1d" },
-       [pcxl2] { "PA7300LC (PCX-L2)",  "1.1e" },
-       [pcxu]  { "PA8000 (PCX-U)",     "2.0" },
-       [pcxu_] { "PA8200 (PCX-U+)",    "2.0" },
-       [pcxw]  { "PA8500 (PCX-W)",     "2.0" },
-       [pcxw_] { "PA8600 (PCX-W+)",    "2.0" },
-       [pcxw2] { "PA8700 (PCX-W2)",    "2.0" },
-       [mako]  { "PA8800 (Mako)",      "2.0" }
+       [pcx]   = { "PA7000 (PCX)",     "1.0" },
+       [pcxs]  = { "PA7000 (PCX-S)",   "1.1a" },
+       [pcxt]  = { "PA7100 (PCX-T)",   "1.1b" },
+       [pcxt_] = { "PA7200 (PCX-T')",  "1.1c" },
+       [pcxl]  = { "PA7100LC (PCX-L)", "1.1d" },
+       [pcxl2] = { "PA7300LC (PCX-L2)",        "1.1e" },
+       [pcxu]  = { "PA8000 (PCX-U)",   "2.0" },
+       [pcxu_] = { "PA8200 (PCX-U+)",  "2.0" },
+       [pcxw]  = { "PA8500 (PCX-W)",   "2.0" },
+       [pcxw_] = { "PA8600 (PCX-W+)",  "2.0" },
+       [pcxw2] = { "PA8700 (PCX-W2)",  "2.0" },
+       [mako]  = { "PA8800 (Mako)",    "2.0" }
 };
 
 const char * __init