diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
| commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
| tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /include/linux/raid/raid1.h | |
| parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
| parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux/raid/raid1.h')
| -rw-r--r-- | include/linux/raid/raid1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h index 9d5494aaac0f..3009c813d83d 100644 --- a/include/linux/raid/raid1.h +++ b/include/linux/raid/raid1.h | |||
| @@ -130,6 +130,6 @@ struct r1bio_s { | |||
| 130 | * with failure when last write completes (and all failed). | 130 | * with failure when last write completes (and all failed). |
| 131 | * Record that bi_end_io was called with this flag... | 131 | * Record that bi_end_io was called with this flag... |
| 132 | */ | 132 | */ |
| 133 | #define R1BIO_Returned 4 | 133 | #define R1BIO_Returned 6 |
| 134 | 134 | ||
| 135 | #endif | 135 | #endif |