From e4d161271ec7e7809f8e2304c14903358651ec1a Mon Sep 17 00:00:00 2001 From: msaitoh Date: Wed, 3 Aug 2016 03:35:24 +0000 Subject: [PATCH] IDT's TSE2002GB2 has the same ID as TS3000GB2, so remove TSE2002GB2. --- sys/dev/i2c/sdtemp.c | 6 ++---- sys/dev/i2c/sdtemp_reg.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sys/dev/i2c/sdtemp.c b/sys/dev/i2c/sdtemp.c index e6391ca557de..d8537cb6c5bc 100644 --- a/sys/dev/i2c/sdtemp.c +++ b/sys/dev/i2c/sdtemp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdtemp.c,v 1.31 2016/07/28 09:11:13 msaitoh Exp $ */ +/* $NetBSD: sdtemp.c,v 1.32 2016/08/03 03:35:24 msaitoh Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.31 2016/07/28 09:11:13 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.32 2016/08/03 03:35:24 msaitoh Exp $"); #include #include @@ -147,8 +147,6 @@ sdtemp_dev_table[] = { "Catalyst CAT34TS02C" }, { CAT_MANUFACTURER_ID, CAT_34TS04_DEVICE_ID, CAT_34TS04_MASK, NULL, "Catalyst CAT34TS04" }, - { IDT_MANUFACTURER_ID, IDT_TSE2002GB2_DEVICE_ID,IDT_TSE2002GB2_MASK, CIDT, - "Integrated Device Technology TSE2002GB2" }, { IDT_MANUFACTURER_ID, IDT_TSE2004GB2_DEVICE_ID,IDT_TSE2004GB2_MASK, NULL, "Integrated Device Technology TSE2004GB2" }, { IDT_MANUFACTURER_ID, IDT_TS3000B3_DEVICE_ID, IDT_TS3000B3_MASK, CIDT, diff --git a/sys/dev/i2c/sdtemp_reg.h b/sys/dev/i2c/sdtemp_reg.h index 1764a1e4d18f..1cbd41117972 100644 --- a/sys/dev/i2c/sdtemp_reg.h +++ b/sys/dev/i2c/sdtemp_reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: sdtemp_reg.h,v 1.10 2016/07/28 09:11:13 msaitoh Exp $ */ +/* $NetBSD: sdtemp_reg.h,v 1.11 2016/08/03 03:35:24 msaitoh Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -159,12 +159,10 @@ #define IDT_TS3000B3_MASK 0xFFFF #define IDT_TS3000GB0_DEVICE_ID 0x2913 #define IDT_TS3000GB0_MASK 0xFFFF -#define IDT_TS3000GB2_DEVICE_ID 0x2912 +#define IDT_TS3000GB2_DEVICE_ID 0x2912 /* Also matched TSE2002GB2 */ #define IDT_TS3000GB2_MASK 0xFFFF #define IDT_TS3001GB2_DEVICE_ID 0x3001 #define IDT_TS3001GB2_MASK 0xFFFF -#define IDT_TSE2002GB2_DEVICE_ID 0x2912 -#define IDT_TSE2002GB2_MASK 0xFFFF #define IDT_TSE2004GB2_DEVICE_ID 0x2214 #define IDT_TSE2004GB2_MASK 0xFFFF