From 4ac76f1a03a3b7f04886b1f57a3926c443514722 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 27 Jun 2011 12:50:14 -0500 Subject: [PATCH] --- yaml --- r: 256103 b: refs/heads/master c: 6a4ecc29c90c322e28941e6dec406b08b5e1f0ea h: refs/heads/master i: 256101: d73d76ec439774bb3c708eb17621aafaef2b51e6 256099: f2ddd1feb5a5292da04aac860444e40ff3c3b21c 256095: 4108992743ad83a2d28a5ba1f985424e1030f935 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtlwifi/pci.c | 2 +- trunk/drivers/net/wireless/rtlwifi/pci.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index de6641aea0ec..52bd818c37f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f05b691150af4cfccbfba6cc708b9a58b9216903 +refs/heads/master: 6a4ecc29c90c322e28941e6dec406b08b5e1f0ea diff --git a/trunk/drivers/net/wireless/rtlwifi/pci.c b/trunk/drivers/net/wireless/rtlwifi/pci.c index 6a15f368ebb9..aa0ba9ec6aa9 100644 --- a/trunk/drivers/net/wireless/rtlwifi/pci.c +++ b/trunk/drivers/net/wireless/rtlwifi/pci.c @@ -390,7 +390,7 @@ static void rtl_pci_parse_configuration(struct pci_dev *pdev, u8 linkctrl_reg; /*Link Control Register */ - pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); + pos = pci_pcie_cap(pdev); pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &linkctrl_reg); pcipriv->ndis_adapter.linkctrl_reg = linkctrl_reg; diff --git a/trunk/drivers/net/wireless/rtlwifi/pci.h b/trunk/drivers/net/wireless/rtlwifi/pci.h index 671b1f5aa0cf..76f42005a118 100644 --- a/trunk/drivers/net/wireless/rtlwifi/pci.h +++ b/trunk/drivers/net/wireless/rtlwifi/pci.h @@ -75,11 +75,6 @@ #define PCI_CONF_ADDRESS 0x0CF8 /*PCI Configuration Space Address */ #define PCI_CONF_DATA 0x0CFC /*PCI Configuration Space Data */ -#define PCI_CLASS_BRIDGE_DEV 0x06 -#define PCI_SUBCLASS_BR_PCI_TO_PCI 0x04 -#define PCI_CAPABILITY_ID_PCI_EXPRESS 0x10 -#define PCI_CAP_ID_EXP 0x10 - #define U1DONTCARE 0xFF #define U2DONTCARE 0xFFFF #define U4DONTCARE 0xFFFFFFFF