[parisc-linux-cvs] linux tsbogend

[Thomas Bogendoerfer]

On Wed, Mar 20, 2002 at 03:49:05AM -0700, Thomas Bogendoerfer wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	tsbogend	02/03/20 03:49:05
> 
> Modified files:
> 	.              : Makefile 
> 
> Log message:
> 2.4.18-pa7:
> added PA8700 and J6700 strings


Index: hardware.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/hardware.c,v
retrieving revision 1.35
diff -u -p -r1.35 hardware.c
--- hardware.c	2002/02/02 20:58:21	1.35
+++ hardware.c	2002/03/20 10:46:51
@@ -218,6 +218,7 @@ static struct hp_hardware hp_hardware_li
 	{HPHW_NPROC,0x5D9,0x4,0x91,"Rhapsody wave 2 W+"},
 	{HPHW_NPROC,0x5DA,0x4,0x91,"Marcato W+ DC-"},
 	{HPHW_NPROC,0x5DB,0x4,0x91,"Marcato W+"},
+	{HPHW_NPROC,0x5DD,0x4,0x81,"Duet W2"},
 	{HPHW_NPROC,0x5DE,0x4,0x81,"Piccolo W+"},
 	{HPHW_NPROC,0x5E7,0x4,0x91,"Caribe W2 800"},
 	{HPHW_NPROC,0x5FF,0x4,0x91,"Hitachi W"},
@@ -1249,9 +1250,10 @@ static struct hp_cpu_type_mask {
 	{ 0x05d4, 0x0ffe, pcxw_  },  /* 0x05d4 - 0x05d5 */
 	{ 0x05d6, 0x0fff, pcxw 	 },  /* 0x05d6 - 0x05d6 */
 	{ 0x05d7, 0x0fff, pcxw_  },  /* 0x05d7 - 0x05d7 */
-	{ 0x05d8, 0x0ff8, pcxw_  },  /* 0x05d8 - 0x05df */
-	{ 0x05e0, 0x0ff0, pcxw_  },  /* 0x05e0 - 0x05ef */
-	{ 0x05f0, 0x0ff0, pcxw_  },  /* 0x05f0 - 0x05ff */
+	{ 0x05d8, 0x0ffc, pcxw_  },  /* 0x05d8 - 0x05db */
+	{ 0x05dc, 0x0ffc, pcxw2  },  /* 0x05dc - 0x05df */
+	{ 0x05e0, 0x0ff0, pcxw2  },  /* 0x05e0 - 0x05ef */
+	{ 0x05f0, 0x0ff0, pcxw2  },  /* 0x05f0 - 0x05ff */
 	{ 0x0600, 0x0ff0, pcxl   },  /* 0x0600 - 0x060f */
 	{ 0x0610, 0x0ff0, pcxl   },  /* 0x0610 - 0x061f */
 	{ 0x0000, 0x0000, pcx    }	/* terminate table */
@@ -1267,7 +1269,8 @@ char *cpu_name_version[][2] = {
 	[pcxu]	{ "PA8000 (PCX-U)",	"2.0" },
 	[pcxu_]	{ "PA8200 (PCX-U+)",	"2.0" },
 	[pcxw]	{ "PA8500 (PCX-W)",	"2.0" },
-	[pcxw_]	{ "PA8600 (PCX-W+)",	"2.0" }
+	[pcxw_]	{ "PA8600 (PCX-W+)",	"2.0" },
+	[pcxw2]	{ "PA8700 (PCX-W2)",	"2.0" }
 };
 
 const char * __init



-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea.                                 [ Alexander Viro on linux-kernel ]