diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
| commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
| tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /drivers/pcmcia | |
| parent | 9d8dc3e529a19e427fd379118acd132520935c5d (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/cardbus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c index 8bde61952d20..4fe4cc4ae19a 100644 --- a/drivers/pcmcia/cardbus.c +++ b/drivers/pcmcia/cardbus.c | |||
| @@ -78,8 +78,7 @@ int __ref cb_alloc(struct pcmcia_socket *s) | |||
| 78 | max = bus->busn_res.start; | 78 | max = bus->busn_res.start; |
| 79 | for (pass = 0; pass < 2; pass++) | 79 | for (pass = 0; pass < 2; pass++) |
| 80 | list_for_each_entry(dev, &bus->devices, bus_list) | 80 | list_for_each_entry(dev, &bus->devices, bus_list) |
| 81 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || | 81 | if (pci_is_bridge(dev)) |
| 82 | dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) | ||
| 83 | max = pci_scan_bridge(bus, dev, max, pass); | 82 | max = pci_scan_bridge(bus, dev, max, pass); |
| 84 | 83 | ||
| 85 | /* | 84 | /* |