From: Grant Coady <[email protected]>
pci_ids.h: removes eight duplicate IDs that crept in during the
2.6.15 development cycle, commented a duplicate where one ID was
defined in terms of another. Compile tested with allyesconfig.
Signed-off-by: Grant Coady <[email protected]>
---
pci_ids.h | 12 +-----------
1 files changed, 1 insertion(+), 11 deletions(-)
--- linux-2.6.15a/include/linux/pci_ids.h 2005-10-28 10:02:08.000000000 +1000
+++ linux-2.6.15b/include/linux/pci_ids.h 2006-01-05 11:37:28.000000000 +1100
@@ -274,7 +274,6 @@
#define PCI_DEVICE_ID_ATI_RAGE128_PP 0x5050
#define PCI_DEVICE_ID_ATI_RAGE128_PQ 0x5051
#define PCI_DEVICE_ID_ATI_RAGE128_PR 0x5052
-#define PCI_DEVICE_ID_ATI_RAGE128_TR 0x5452
#define PCI_DEVICE_ID_ATI_RAGE128_PS 0x5053
#define PCI_DEVICE_ID_ATI_RAGE128_PT 0x5054
#define PCI_DEVICE_ID_ATI_RAGE128_PU 0x5055
@@ -585,7 +584,6 @@
#define PCI_DEVICE_ID_CT_65550 0x00e0
#define PCI_DEVICE_ID_CT_65554 0x00e4
#define PCI_DEVICE_ID_CT_65555 0x00e5
-#define PCI_DEVICE_ID_CT_69000 0x00c0
#define PCI_VENDOR_ID_MIRO 0x1031
#define PCI_DEVICE_ID_MIRO_36050 0x5601
@@ -1197,7 +1195,6 @@
#define PCI_DEVICE_ID_QUADRO_FX_GO1400 0x00cc
#define PCI_DEVICE_ID_QUADRO_FX_1400 0x00ce
#define PCI_DEVICE_ID_NVIDIA_NFORCE3 0x00d1
-#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da
#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS 0x00d4
#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE 0x00d5
#define PCI_DEVICE_ID_NVIDIA_NVENET_3 0x00d6
@@ -1623,7 +1620,7 @@
#define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
-#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
+#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB 0x0220 /* same as previous */
#define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221
#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
#define PCI_DEVICE_ID_SERVERWORKS_GCLE 0x0225
@@ -1792,10 +1789,6 @@
#define PCI_DEVICE_ID_PC300_TE_M_2 0x0320
#define PCI_DEVICE_ID_PC300_TE_M_1 0x0321
-/* Allied Telesyn */
-#define PCI_VENDOR_ID_AT 0x1259
-#define PCI_SUBDEVICE_ID_AT_2701FX 0x2703
-
#define PCI_VENDOR_ID_ESSENTIAL 0x120f
#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER 0x0001
@@ -2344,9 +2337,6 @@
#define PCI_DEVICE_ID_DCI_PCCOM4 0x0001
#define PCI_DEVICE_ID_DCI_PCCOM8 0x0002
-#define PCI_VENDOR_ID_DUNORD 0x5544
-#define PCI_DEVICE_ID_DUNORD_I3000 0x0001
-
#define PCI_VENDOR_ID_GENROCO 0x5555
#define PCI_DEVICE_ID_GENROCO_HFP832 0x0003
On Thu, 05 Jan 2006 12:14:16 +1100, Grant Coady <[email protected]> wrote:
>
>From: Grant Coady <[email protected]>
>
>pci_ids.h: removes eight duplicate IDs that crept in during the
> 2.6.15 development cycle, commented a duplicate where one ID was
> defined in terms of another. Compile tested with allyesconfig.
>
>Signed-off-by: Grant Coady <[email protected]>
Sorry gang, please scratch. I'll wait for -mm1
Cheers,
Grant.
On Thu, Jan 05, 2006 at 12:40:12PM +1100, Grant Coady wrote:
> On Thu, 05 Jan 2006 12:14:16 +1100, Grant Coady <[email protected]> wrote:
>
> >
> >From: Grant Coady <[email protected]>
> >
> >pci_ids.h: removes eight duplicate IDs that crept in during the
> > 2.6.15 development cycle, commented a duplicate where one ID was
> > defined in terms of another. Compile tested with allyesconfig.
> >
> >Signed-off-by: Grant Coady <[email protected]>
>
> Sorry gang, please scratch. I'll wait for -mm1
Why scratch, what was wrong?
I'd suggest working against Linus's git tree, that might be a bit
simpler than the -mm tree, and is what I merge against.
thanks,
greg k-h
On Wed, 4 Jan 2006 19:42:13 -0800, Greg KH <[email protected]> wrote:
>On Thu, Jan 05, 2006 at 12:40:12PM +1100, Grant Coady wrote:
>> On Thu, 05 Jan 2006 12:14:16 +1100, Grant Coady <[email protected]> wrote:
>>
>> >
>> >From: Grant Coady <[email protected]>
>> >
>> >pci_ids.h: removes eight duplicate IDs that crept in during the
>> > 2.6.15 development cycle, commented a duplicate where one ID was
>> > defined in terms of another. Compile tested with allyesconfig.
>> >
>> >Signed-off-by: Grant Coady <[email protected]>
>>
>> Sorry gang, please scratch. I'll wait for -mm1
>
>Why scratch, what was wrong?
'Cos sometimes I do incredibly dumb things like copy 2.6.14 over
2.6.15 (well it was the a and b), so:
grant@sempro:~/linux$ do-device-id linux-2.6.15
find pci_ids defined
find symbols in source tree
find source defined symbols files
summary, line counts:
1797 symbols-pci_ids.h-define
0 symbols-pci_ids.h-dups <<== no duplicates
2194 symbols-pci_ids.h-new
2194 symbols-pci_ids.h-orig
1933 symbols-source-all
433 symbols-source-define
104 symbols-source-define-files <<== clean these up??
1214 symbols-source-files-include-pci.h
29 symbols-source-files-include-pci_ids.h
The patch to scratch was really a 2.6.14 pretending to be 2.6.15,
not wanted by anybody.
Then I was intending to start on the source files then define or
redefine PCI IDs, removing those defines to the main pci_ids.h
file.
>I'd suggest working against Linus's git tree, that might be a bit
>simpler than the -mm tree, and is what I merge against.
Okay, thanks,
Grant.