| Message ID | 1299744312-6291-1-git-send-email-sledz@dresearch.de |
|---|---|
| State | Accepted |
| Commit | 1065cda8a1a57d0d3bfccdce1a655a84439d24e0 |
| Headers | show |
On Thu, 2011-03-10 at 09:05 +0100, Steffen Sledz wrote: > Signed-off-by: Steffen Sledz <sledz@dresearch.de> > --- > drivers/mtd/chips/cfi_cmdset_0002.c | 1 + > include/linux/mtd/cfi.h | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-) Pushed to l2-mtd-2.6.git tree, thanks!
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index f072fcf..8338d33 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -349,6 +349,7 @@ static struct cfi_fixup cfi_fixup_table[] = { { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri }, #ifdef AMD_BOOTLOC_BUG { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock }, + { CFI_MFR_AMIC, CFI_ID_ANY, fixup_amd_bootblock }, { CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock }, #endif { CFI_MFR_AMD, 0x0050, fixup_use_secsi }, diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index a9baee6..0d823f2 100644 --- 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
Signed-off-by: Steffen Sledz <sledz@dresearch.de> --- drivers/mtd/chips/cfi_cmdset_0002.c | 1 + include/linux/mtd/cfi.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)