git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
linux
/
mtd
/
cfi.h
diff --git
a/include/linux/mtd/cfi.h
b/include/linux/mtd/cfi.h
index
123948b
..
23a5689
100644
(file)
--- a/
include/linux/mtd/cfi.h
+++ b/
include/linux/mtd/cfi.h
@@
-7,6
+7,7
@@
#ifndef __MTD_CFI_H__
#define __MTD_CFI_H__
#ifndef __MTD_CFI_H__
#define __MTD_CFI_H__
+#include <linux/config.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/interrupt.h>
@@
-199,18
+200,6
@@
struct cfi_pri_amdstd {
uint8_t TopBottom;
} __attribute__((packed));
uint8_t TopBottom;
} __attribute__((packed));
-/* Vendor-Specific PRI for Atmel chips (command set 0x0002) */
-
-struct cfi_pri_atmel {
- uint8_t pri[3];
- uint8_t MajorVersion;
- uint8_t MinorVersion;
- uint8_t Features;
- uint8_t BottomBoot;
- uint8_t BurstMode;
- uint8_t PageMode;
-} __attribute__((packed));
-
struct cfi_pri_query {
uint8_t NumFields;
uint32_t ProtField[1]; /* Not host ordered */
struct cfi_pri_query {
uint8_t NumFields;
uint32_t ProtField[1]; /* Not host ordered */
@@
-476,7
+465,6
@@
struct cfi_fixup {
#define CFI_ID_ANY 0xffff
#define CFI_MFR_AMD 0x0001
#define CFI_ID_ANY 0xffff
#define CFI_MFR_AMD 0x0001
-#define CFI_MFR_ATMEL 0x001F
#define CFI_MFR_ST 0x0020 /* STMicroelectronics */
void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);
#define CFI_MFR_ST 0x0020 /* STMicroelectronics */
void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);