xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: merge MTD development from v4.4 into for-v4.5 development

Browse Source 
Small conflict between some bugfixes for 4.4 and some refactoring for
4.5.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Brian Norris
2016-01-05 16:04:40 -08:00
parent 887e9d3a1f a32d5b726f
commit e576330033
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mtd/spi-nor.h
View File

@@ -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