diff options
| author | Tom Rini <trini@konsulko.com> | 2022-08-04 16:53:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-04 16:54:01 -0400 |
| commit | b8e09898919e23c5d7f1934be7bf9a3a6f0deb0e (patch) | |
| tree | ba1c168b729947aec2a487791e5a26ce72da4282 /fs/jffs2/jffs2_1pass.c | |
| parent | 62e6418031bed3671e57e63d49273e2739a82589 (diff) | |
| parent | 78475d2572615471d3c047e61481a68859d0dd7f (diff) | |
Merge branch '2022-08-04-Kconfig-migrations'
- Further migrations to Kconfig and associated dead code removal.
Diffstat (limited to 'fs/jffs2/jffs2_1pass.c')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 1818e81215..ef7b302725 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -113,7 +113,6 @@ #include <common.h> #include <config.h> -#include <flash.h> #include <malloc.h> #include <div64.h> #include <linux/compiler.h> @@ -381,6 +380,8 @@ static void put_fl_mem_onenand(void *buf) #if defined(CONFIG_CMD_FLASH) +#include <flash.h> + /* * Support for jffs2 on top of NOR-flash * @@ -392,7 +393,6 @@ static inline void *get_fl_mem_nor(u32 off, u32 size, void *ext_buf) u32 addr = off; struct mtdids *id = current_part->dev->id; - extern flash_info_t flash_info[]; flash_info_t *flash = &flash_info[id->num]; addr += flash->start[0]; |