diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-14 23:01:00 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-14 23:01:00 -0500 |
| commit | 83a2c36c8f93b2c7ba6bd7ca5d0434c27aaa1e88 (patch) | |
| tree | 99b3d645f7ce13c1e6801a72d3a09c8deebe45db /arch/s390/include/asm/pci_insn.h | |
| parent | 2f8f64834b7cc5374b0b1f4ce328bc8f24115abf (diff) | |
| parent | 3781db07c79e7e4c5273c902f9c4718795866a1c (diff) | |
| download | linux-rt-83a2c36c8f93b2c7ba6bd7ca5d0434c27aaa1e88.tar.gz | |
Merge tag 'v4.9.68' into v4.9-rt
This is the 4.9.68 stable release
Diffstat (limited to 'arch/s390/include/asm/pci_insn.h')
| -rw-r--r-- | arch/s390/include/asm/pci_insn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h index 649eb62c52b3..9e02cb7955c1 100644 --- a/arch/s390/include/asm/pci_insn.h +++ b/arch/s390/include/asm/pci_insn.h @@ -81,6 +81,6 @@ int zpci_refresh_trans(u64 fn, u64 addr, u64 range); int zpci_load(u64 *data, u64 req, u64 offset); int zpci_store(u64 data, u64 req, u64 offset); int zpci_store_block(const u64 *data, u64 req, u64 offset); -void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc); +int zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc); #endif |