diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-19 22:10:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-19 22:10:04 +0100 |
| commit | b3f7e3f23a763ccaae7b52d88d2c91e66c80d406 (patch) | |
| tree | e00e90eb161305ed9895315ba12e30ac17de9523 /include/linux/mtd | |
| parent | 4ee9e6e027c06eb1dd1cdbe025d461e407ece755 (diff) | |
| parent | 7008ee121089b8193aea918b98850fe87d996508 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/flashchip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index ecc88a41792a..c04f690871ca 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -40,7 +40,7 @@ typedef enum { FL_READING, FL_CACHEDPRG, /* These 4 come from onenand_state_t, which has been unified here */ - FL_RESETING, + FL_RESETTING, FL_OTPING, FL_PREPARING_ERASE, FL_VERIFYING_ERASE, |