diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-11-24 13:54:37 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-11-24 13:54:37 -0500 |
| commit | 3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db (patch) | |
| tree | c682da7317845d7b1336e3d8498cf83bdf8f5900 /include/linux/mtd/onenand_regs.h | |
| parent | 42569c39917a08e8de1e8b5685463be7b74baebd (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'include/linux/mtd/onenand_regs.h')
| -rw-r--r-- | include/linux/mtd/onenand_regs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mtd/onenand_regs.h b/include/linux/mtd/onenand_regs.h index d1b310c92eb4..0c6bbe28f38c 100644 --- a/include/linux/mtd/onenand_regs.h +++ b/include/linux/mtd/onenand_regs.h | |||
| @@ -152,6 +152,8 @@ | |||
| 152 | #define ONENAND_SYS_CFG1_INT (1 << 6) | 152 | #define ONENAND_SYS_CFG1_INT (1 << 6) |
| 153 | #define ONENAND_SYS_CFG1_IOBE (1 << 5) | 153 | #define ONENAND_SYS_CFG1_IOBE (1 << 5) |
| 154 | #define ONENAND_SYS_CFG1_RDY_CONF (1 << 4) | 154 | #define ONENAND_SYS_CFG1_RDY_CONF (1 << 4) |
| 155 | #define ONENAND_SYS_CFG1_HF (1 << 2) | ||
| 156 | #define ONENAND_SYS_CFG1_SYNC_WRITE (1 << 1) | ||
| 155 | 157 | ||
| 156 | /* | 158 | /* |
| 157 | * Controller Status Register F240h (R) | 159 | * Controller Status Register F240h (R) |