diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-11-11 22:31:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-22 10:05:23 +0300 |
| commit | d1d93a58521c0ba2a251c1f7fc879bad6a25f8f0 (patch) | |
| tree | d8d2ec2fb4db7097259015ba78adab83a5650602 /drivers/isdn/hardware | |
| parent | 1b94ac684bb2d905235d1b4d49f6b77a26e11248 (diff) | |
| download | linux-d1d93a58521c0ba2a251c1f7fc879bad6a25f8f0.tar.xz | |
PCI: add USR vendor id and use it in r8169 and w6692 driver
[ Upstream commit 9206eb0bc5679d06d2f54b9db86fe2b9a55e07e4 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/w6692.c | 3 |
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; |