Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / include / linux / mtd / cfi.h

diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index a9baee6..d249254 100644 (file)
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -308,7 +308,7 @@ static inline uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,
        
        addr = (cmd_ofs * type) * interleave;
 
-       /* Modify the unlock address if we are in compatiblity mode.
+       /* Modify the unlock address if we are in compatibility mode.
         * For 16bit devices on 8 bit busses
         * and 32bit devices on 16 bit busses
         * set the low bit of the alternating bit sequence of the address.
@@ -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