summaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2018-11-11 20:31:21 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-11 23:00:05 +0100
commit9206eb0bc5679d06d2f54b9db86fe2b9a55e07e4 (patch)
tree2c748ca366908693f65fd4a2e2cee3163274f575 /drivers/isdn
parentnet_sched: sch_fq: add dctcp-like marking (diff)
downloadlinux-9206eb0bc5679d06d2f54b9db86fe2b9a55e07e4.tar.xz
linux-9206eb0bc5679d06d2f54b9db86fe2b9a55e07e4.zip
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: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hardware/mISDN/w6692.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 5acf6ab67cd3..6f60aced11c5 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -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;