diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-01-05 16:04:40 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-01-05 16:05:56 -0800 |
| commit | e576330033936d94a00068760a5744e27ce51a32 (patch) | |
| tree | e91b17f2e0820e506a4a6c91afc921a3cea4cd63 /include/linux/mtd/spi-nor.h | |
| parent | 887e9d3a1f3e93a1c64294649c0dd301035a7892 (diff) | |
| parent | a32d5b726ff8cf32bf491522b0ac8ae2545a063e (diff) | |
mtd: merge MTD development from v4.4 into for-v4.5 development
Small conflict between some bugfixes for 4.4 and some refactoring for
4.5.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'include/linux/mtd/spi-nor.h')
| -rw-r--r-- | include/linux/mtd/spi-nor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index fac3f6f53981..62356d50815b 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -26,7 +26,7 @@ #define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX #define SNOR_MFR_SPANSION CFI_MFR_AMD #define SNOR_MFR_SST CFI_MFR_SST -#define SNOR_MFR_WINBOND 0xef +#define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */ /* * Note on opcode nomenclature: some opcodes have a format like |