diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:31:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:31:01 +0100 |
| commit | ad54c3e75d27686ac7e97e17d242fbc568f6c2e3 (patch) | |
| tree | fd64603df00b919496c3b166409de53e22d49312 /include | |
| parent | bus: add driver for the Technologic Systems NBUS (diff) | |
| parent | memory: omap-gpmc: Remove deprecated gpmc_update_nand_reg() (diff) | |
| download | linux-ad54c3e75d27686ac7e97e17d242fbc568f6c2e3.tar.xz linux-ad54c3e75d27686ac7e97e17d242fbc568f6c2e3.zip | |
Merge tag 'gpmc-omap-for-v4.15-pt2' of https://github.com/rogerq/linux into next/drivers
Pull "OMAP-GPMC: driver updates for v4.15, part 2" from Roger Quadros:
* get rid of unused function gpmc_update_nand_reg().
* tag 'gpmc-omap-for-v4.15-pt2' of https://github.com/rogerq/linux:
memory: omap-gpmc: Remove deprecated gpmc_update_nand_reg()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omap-gpmc.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/omap-gpmc.h b/include/linux/omap-gpmc.h index fd0de00c0d77..edfa280c3d56 100644 --- a/include/linux/omap-gpmc.h +++ b/include/linux/omap-gpmc.h @@ -36,18 +36,6 @@ static inline struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs } #endif /* CONFIG_OMAP_GPMC */ -/*--------------------------------*/ - -/* deprecated APIs */ -#if IS_ENABLED(CONFIG_OMAP_GPMC) -void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); -#else -static inline void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) -{ -} -#endif /* CONFIG_OMAP_GPMC */ -/*--------------------------------*/ - extern int gpmc_calc_timings(struct gpmc_timings *gpmc_t, struct gpmc_settings *gpmc_s, struct gpmc_device_timings *dev_t); |