diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 16:27:11 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 16:27:11 (GMT) |
| commit | 2b97f10b3896f5c155b28f6c733735fd60f4b3f9 (patch) | |
| tree | efc8feafea5be5206412b9f9f594f4d0a8069855 /include | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
| parent | 3950fffdf0c088dd4d9e85c9a5a6be4c6e8b5a07 (diff) | |
| download | linux-2b97f10b3896f5c155b28f6c733735fd60f4b3f9.tar.xz | |
Merge tag 'gpmc-omap-for-v4.9' of https://github.com/rogerq/linux into next/drivers
Merge "OMAP-GPMC: driver updates for v4.9" from Roger Quadros:
* Fix potential build failure if CONFIG_OMAP_GPMC is disabled while
OMAP_NAND driver is enabled
* Trivial fixes which fix build warnings and code check tool warnings
(Coccinelle)
* Use devm_gpiochip_add_data()
* tag 'gpmc-omap-for-v4.9' of https://github.com/rogerq/linux:
memory: omap-gpmc: make gpmc_clk_ticks_to_ns() static
memory: omap-gpmc: Fix build with CONFIG_OMAP_GPMC disabled
memory: omap-gpmc: use devm_gpiochip_add_data()
memory: omap-gpmc: Delete an unnecessary check before the function call "gpiochip_free_own_desc"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omap-gpmc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index 9e9d79e..35d0fd7 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h @@ -29,8 +29,8 @@ struct gpmc_nand_regs; struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *regs, int cs); #else -static inline gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *regs, - int cs) +static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *regs, + int cs) { return NULL; } |