diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-12 05:56:06 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-12 05:56:06 -0600 |
| commit | e58f087e9c579a909e62600c3812801227cd564c (patch) | |
| tree | acd554a9a7a01f43511f5a67bb0d645996315d3b /include | |
| parent | 23025cbccada8908fc6cd4d09e851de66898d2d7 (diff) | |
| parent | c0f7ae27539fbac267384a7bfc58296ea7550d52 (diff) | |
| download | linux-e58f087e9c579a909e62600c3812801227cd564c.tar.bz2 | |
Merge tag 'mtd/fixes-for-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD fixes from Miquel Raynal:
- cfi: Allow building spi-intel standalone to avoid build issues
- parsers: scpart: Fix __udivdi3 undefined on mips
- parsers: tplink_safeloader: Fix potential memory leak during parsing
- Update email of Tudor Ambarus
* tag 'mtd/fixes-for-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
MAINTAINERS: Update email of Tudor Ambarus
mtd: cfi: allow building spi-intel standalone
mtd: parsers: scpart: fix __udivdi3 undefined on mips
mtd: parsers: Fix potential memory leak in mtd_parser_tplink_safeloader_parse()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 25765556223a..a3f8cdca90c8 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -7,7 +7,6 @@ #define __LINUX_MTD_SPI_NOR_H #include <linux/bitops.h> -#include <linux/mtd/cfi.h> #include <linux/mtd/mtd.h> #include <linux/spi/spi-mem.h> |