diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 12:50:41 +0100 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 12:50:41 +0100 |
| commit | 7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5 (patch) | |
| tree | 3916e6cf9678a41081ae822ef67ec5cae1c1fffa /arch/mips/pci/pci-xlr.c | |
| parent | platform/x86: silead_dmi: Add entry for the Digma e200 tablet (diff) | |
| parent | i2c-cht-wc: Add device-properties for fusb302 integration (diff) | |
| download | linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.tar.xz linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.zip | |
Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:
as discussed before, here is the immutable branch for the i2c-cht-wc
driver, so you can safely apply Hans' patch [1]
"platform/x86: intel_cht_int33fe: Update fusb302 type string, add properties"
on top of this.
[1] http://patchwork.ozlabs.org/patch/824314/
Diffstat (limited to 'arch/mips/pci/pci-xlr.c')
| -rw-r--r-- | arch/mips/pci/pci-xlr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c index 26d2dabef281..2a1c81a129ba 100644 --- a/arch/mips/pci/pci-xlr.c +++ b/arch/mips/pci/pci-xlr.c @@ -315,7 +315,7 @@ static void xls_pcie_ack_b(struct irq_data *d) } } -int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { return get_irq_vector(dev); } |