diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-21 18:35:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-21 18:35:02 -0800 |
| commit | 83d09ad4b950651a95d37697f1493c00d888d0db (patch) | |
| tree | 414f7da2169ec99b0f3700dadd1aa87dc86ca2d2 /drivers | |
| parent | 36ada25026357c855d5839166f78017509824b77 (diff) | |
| parent | 031c7a8cd6fc565e90320bf08f22ee6e70f9d969 (diff) | |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC fixes from Stafford Horne:
- Compiler warning fixup for new Litex SoC driver
- Sparse warning fixup for iounmap
* tag 'for-linus' of git://github.com/openrisc/linux:
openrisc: io: Add missing __iomem annotation to iounmap()
soc: litex: Fix compile warning when device tree is not configured
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/litex/litex_soc_ctrl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/litex/litex_soc_ctrl.c b/drivers/soc/litex/litex_soc_ctrl.c index 1217cafdfd4d..9b0766384570 100644 --- a/drivers/soc/litex/litex_soc_ctrl.c +++ b/drivers/soc/litex/litex_soc_ctrl.c @@ -140,12 +140,13 @@ struct litex_soc_ctrl_device { void __iomem *base; }; +#ifdef CONFIG_OF static const struct of_device_id litex_soc_ctrl_of_match[] = { {.compatible = "litex,soc-controller"}, {}, }; - MODULE_DEVICE_TABLE(of, litex_soc_ctrl_of_match); +#endif /* CONFIG_OF */ static int litex_soc_ctrl_probe(struct platform_device *pdev) { |