diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 19:59:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 19:59:56 -0500 |
| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (patch) | |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 /drivers/acpi | |
| parent | 8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f (diff) | |
| parent | 59343cd7c4809cf7598789e1cd14563780ae4239 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c
Two simple sets of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 5277a0ee5704..b1def411c0b8 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c | |||
| @@ -512,7 +512,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev) | |||
| 512 | dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin)); | 512 | dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin)); |
| 513 | if (gsi >= 0) { | 513 | if (gsi >= 0) { |
| 514 | acpi_unregister_gsi(gsi); | 514 | acpi_unregister_gsi(gsi); |
| 515 | dev->irq = 0; | ||
| 516 | dev->irq_managed = 0; | 515 | dev->irq_managed = 0; |
| 517 | } | 516 | } |
| 518 | } | 517 | } |