diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-04 11:41:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-04 11:41:31 -0800 |
| commit | f74a127f667faa9691ed3c4d584134a7a21a8647 (patch) | |
| tree | 92db1e6e7dbc8daaabd8b43e08f62a884f37c2f7 /drivers/irqchip | |
| parent | Merge tag 'for-linus-20180204' of git://git.kernel.dk/linux-block (diff) | |
| parent | genirq: Make legacy autoprobing work again (diff) | |
| download | linux-dev-f74a127f667faa9691ed3c4d584134a7a21a8647.tar.xz linux-dev-f74a127f667faa9691ed3c4d584134a7a21a8647.zip | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"Two small changes:
- a fix for a interrupt regression caused by the vector management
changes in 4.15 affecting museum pieces which rely on interrupt
probing for legacy (e.g. parallel port) devices.
One of the startup calls in the autoprobe code was not changed to
the new activate_and_startup() function resulting in a warning and
as a consequence failing to discover the device interrupt.
- a trivial update to the copyright/license header of the STM32 irq
chip driver"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Make legacy autoprobing work again
irqchip/stm32: Fix copyright
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-stm32-exti.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c index 31ab0dee2ce7..36f0fbe36c35 100644 --- a/drivers/irqchip/irq-stm32-exti.c +++ b/drivers/irqchip/irq-stm32-exti.c @@ -1,7 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) Maxime Coquelin 2015 + * Copyright (C) STMicroelectronics 2017 * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com> - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/bitops.h> |