From aa6bf8eeef81ee52ea8a624781abedea06dfee4d Mon Sep 17 00:00:00 2001 From: Stanislav Fomichev Date: Sun, 10 Apr 2011 22:34:20 +0400 Subject: [PATCH] --- yaml --- r: 249154 b: refs/heads/master c: 85633f62b5693e6c7b56d1b3db83bd5e56776ae3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/include/pcicfg.h | 5 ----- trunk/drivers/staging/brcm80211/util/nicpci.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 232f47008abd..bff0f0febbbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d83942856615c17724201a9aecda5b4c582a2476 +refs/heads/master: 85633f62b5693e6c7b56d1b3db83bd5e56776ae3 diff --git a/trunk/drivers/staging/brcm80211/include/pcicfg.h b/trunk/drivers/staging/brcm80211/include/pcicfg.h index 4a519f2852d5..dff8ae55c7e1 100644 --- a/trunk/drivers/staging/brcm80211/include/pcicfg.h +++ b/trunk/drivers/staging/brcm80211/include/pcicfg.h @@ -56,11 +56,6 @@ typedef struct _pci_config_regs { /* Classes and subclasses */ -/* Header types */ -typedef enum { - PCI_HEADER_NORMAL -} pci_header_types; - /* Overlay for a PCI-to-PCI bridge */ #define PPB_RSVDA_MAX 2 diff --git a/trunk/drivers/staging/brcm80211/util/nicpci.c b/trunk/drivers/staging/brcm80211/util/nicpci.c index 7d441c359631..9be55ea96b12 100644 --- a/trunk/drivers/staging/brcm80211/util/nicpci.c +++ b/trunk/drivers/staging/brcm80211/util/nicpci.c @@ -130,7 +130,7 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id, /* check for Header type 0 */ pci_read_config_byte(dev, PCI_HEADER_TYPE, &byte_val); - if ((byte_val & 0x7f) != PCI_HEADER_NORMAL) + if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL) goto end; /* check if the capability pointer field exists */