diff options
author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
commit | 05e97a9eda72d58dba293857df6aac62584ef99a (patch) | |
tree | e86e692f26d4879ff2210c54722e2b7780210249 /arch/arm/mach-omap2/prm_common.c | |
parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
parent | d4ed3b9015b5eebc90d629579d9e7944607cbae5 (diff) |
Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD
From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.
tango fixes:
* Add missing MODULE_DEVICE_TABLE() in tango_nand.c
* Update the number of corrected bitflips
core fixes:
* Fix a long standing memory leak in nand_scan_tail()
* Fix several bugs introduced by the per-vendor init/detection
infrastructure (introduced in 4.12)
* Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""
Diffstat (limited to 'arch/arm/mach-omap2/prm_common.c')
-rw-r--r-- | arch/arm/mach-omap2/prm_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 2b138b65129a..dc11841ca334 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c | |||
@@ -711,7 +711,7 @@ static struct omap_prcm_init_data scrm_data __initdata = { | |||
711 | }; | 711 | }; |
712 | #endif | 712 | #endif |
713 | 713 | ||
714 | static const struct of_device_id const omap_prcm_dt_match_table[] __initconst = { | 714 | static const struct of_device_id omap_prcm_dt_match_table[] __initconst = { |
715 | #ifdef CONFIG_SOC_AM33XX | 715 | #ifdef CONFIG_SOC_AM33XX |
716 | { .compatible = "ti,am3-prcm", .data = &am3_prm_data }, | 716 | { .compatible = "ti,am3-prcm", .data = &am3_prm_data }, |
717 | #endif | 717 | #endif |