projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
[cascardo/linux.git]
/
include
/
linux
/
mtd
/
cfi.h
diff --git
a/include/linux/mtd/cfi.h
b/include/linux/mtd/cfi.h
index
a9baee6
..
0d823f2
100644
(file)
--- a/
include/linux/mtd/cfi.h
+++ b/
include/linux/mtd/cfi.h
@@
-535,6
+535,7
@@
struct cfi_fixup {
#define CFI_MFR_CONTINUATION 0x007F
#define CFI_MFR_AMD 0x0001
+#define CFI_MFR_AMIC 0x0037
#define CFI_MFR_ATMEL 0x001F
#define CFI_MFR_EON 0x001C
#define CFI_MFR_FUJITSU 0x0004