diff options
Diffstat (limited to 'include/linux/mtd/flashchip.h')
-rw-r--r-- | include/linux/mtd/flashchip.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index c66ba812bf90..675776fa3e27 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * (C) 2000 Red Hat. GPLd. | 7 | * (C) 2000 Red Hat. GPLd. |
8 | * | 8 | * |
9 | * $Id: flashchip.h,v 1.15 2004/11/05 22:41:06 nico Exp $ | 9 | * $Id: flashchip.h,v 1.17 2005/03/14 18:27:15 bjd Exp $ |
10 | * | 10 | * |
11 | */ | 11 | */ |
12 | 12 | ||
@@ -29,6 +29,7 @@ typedef enum { | |||
29 | FL_ERASE_SUSPENDED, | 29 | FL_ERASE_SUSPENDED, |
30 | FL_WRITING, | 30 | FL_WRITING, |
31 | FL_WRITING_TO_BUFFER, | 31 | FL_WRITING_TO_BUFFER, |
32 | FL_OTP_WRITE, | ||
32 | FL_WRITE_SUSPENDING, | 33 | FL_WRITE_SUSPENDING, |
33 | FL_WRITE_SUSPENDED, | 34 | FL_WRITE_SUSPENDED, |
34 | FL_PM_SUSPENDED, | 35 | FL_PM_SUSPENDED, |
@@ -62,8 +63,8 @@ struct flchip { | |||
62 | flstate_t state; | 63 | flstate_t state; |
63 | flstate_t oldstate; | 64 | flstate_t oldstate; |
64 | 65 | ||
65 | int write_suspended:1; | 66 | unsigned int write_suspended:1; |
66 | int erase_suspended:1; | 67 | unsigned int erase_suspended:1; |
67 | unsigned long in_progress_block_addr; | 68 | unsigned long in_progress_block_addr; |
68 | 69 | ||
69 | spinlock_t *mutex; | 70 | spinlock_t *mutex; |