Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9206eb0b authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

PCI: add USR vendor id and use it in r8169 and w6692 driver 



The PCI vendor id of U.S. Robotics isn't defined in pci_ids.h so far,
only ISDN driver w6692 has a private definition. Move the definition
to pci_ids.h and use it in the r8169 driver too.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48872c11

drivers/isdn/hardware/mISDN/w6692.c

+0 −3
Original line number Diff line number Diff line
@@ -52,10 +52,7 @@ static const struct w6692map w6692_map[] = 
	{W6692_USR, "USR W6692"}

};



#ifndef PCI_VENDOR_ID_USR

#define PCI_VENDOR_ID_USR	0x16ec

#define PCI_DEVICE_ID_USR_6692	0x3409

#endif



struct w6692_ch {

	struct bchannel		bch;

drivers/net/ethernet/realtek/r8169.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static const struct pci_device_id rtl8169_pci_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4302), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_AT,		0xc107), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(0x16ec,			0x0116), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_USR,		0x0116), 0, 0, RTL_CFG_0 },

	{ PCI_VENDOR_ID_LINKSYS,		0x1032,

		PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },

	{ 0x0001,				0x8168,

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2359,6 +2359,8 @@ 


#define PCI_VENDOR_ID_SYNOPSYS		0x16c3



#define PCI_VENDOR_ID_USR		0x16ec



#define PCI_VENDOR_ID_VITESSE		0x1725

#define PCI_DEVICE_ID_VITESSE_VSC7174	0x7174