diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:32:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:32:44 +0100 |
| commit | 8c5db92a705d9e2c986adec475980d1120fa07b4 (patch) | |
| tree | 9f0eea56889819707c0a1a8eb5b1fb2db3cdaf3d /arch/alpha/kernel/sys_sx164.c | |
| parent | ca5d376e17072c1b60c3fee66f3be58ef018952d (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
| download | talos-op-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.tar.gz talos-op-linux-8c5db92a705d9e2c986adec475980d1120fa07b4.zip | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
include/linux/compiler-clang.h
include/linux/compiler-gcc.h
include/linux/compiler-intel.h
include/uapi/linux/stddef.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/kernel/sys_sx164.c')
| -rw-r--r-- | arch/alpha/kernel/sys_sx164.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_sx164.c b/arch/alpha/kernel/sys_sx164.c index d063b360efed..1ec638a2746a 100644 --- a/arch/alpha/kernel/sys_sx164.c +++ b/arch/alpha/kernel/sys_sx164.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/alpha/kernel/sys_sx164.c * @@ -94,10 +95,10 @@ sx164_init_irq(void) * 9 32 bit PCI option slot 3 */ -static int __init +static int sx164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - static char irq_tab[5][5] __initdata = { + static char irq_tab[5][5] = { /*INT INTA INTB INTC INTD */ { 16+ 9, 16+ 9, 16+13, 16+17, 16+21}, /* IdSel 5 slot 2 J17 */ { 16+11, 16+11, 16+15, 16+19, 16+23}, /* IdSel 6 slot 0 J19 */ |
