History

Merge tag 'fpga-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-next

Moritz writes: FPGA Manager changes for 5.4-rc1 Here is the first set of changes for the 5.4-rc1 merge window. They're all more or less cleanup patches: - Carlos' patch addresses a checkpatch warning - My first patch changes the return type of a function to align it with the fact that nothing checks the return value and it uncoditionally returned 0 anyways - My second patch somehow fell through the cracks before and cleans up the FPGA bridge bindings by consolidating them instead of repeating the same paragraph over and over again. All of these patches have been in the last few linux-next releases without issues. Signed-off-by: Moritz Fischer <mdf@kernel.org> * tag 'fpga-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga: dt-bindings: fpga: Consolidate bridge properties fpga: altera-pr-ip: Make alt_pr_unregister function void fpga: altera-cvp: Fix function definition argument

Greg Kroah-Hartman committed 7 years ago

Commit cec2cae2 parents f51cf9e 2949dc49 files · +25 −24Browse files

Showing the changes to include/linux (1 of 9 files). Show all

Unified · Split

include/linux/fpga/altera-pr-ip-core.h+1−1
@@ -13,6 +13,6 @@ · 12 unmodified lines
13#include <linux/io.h>13#include <linux/io.h>
14 14
15int alt_pr_register(struct device *dev, void __iomem *reg_base);15int alt_pr_register(struct device *dev, void __iomem *reg_base);
16int alt_pr_unregister(struct device *dev);16void alt_pr_unregister(struct device *dev);
17 17
18#endif /* _ALT_PR_IP_CORE_H */18#endif /* _ALT_PR_IP_CORE_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t