diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
| commit | 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 (patch) | |
| tree | c4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 /include/linux/raid | |
| parent | 84ac69e8bf9f36eb0166817373336d14fa58f5cc (diff) | |
| parent | aec5c3c1a929d7d79a420e943285cf3ba26a7c0d (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'include/linux/raid')
| -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 |