diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 11:37:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 11:37:45 -0800 |
commit | c827ba4cb49a30ce581201fd0ba2be77cde412c7 (patch) | |
tree | b573020e4d30ecdf69b22fcd1ced3dbb0e024ed3 /fs/partitions/msdos.c | |
parent | fdba0f2da4b1db682b829b76302b2f25c376051c (diff) | |
parent | 784020fb950741cbb7390c6b622321da626fb1e8 (diff) | |
download | linux-3.10-c827ba4cb49a30ce581201fd0ba2be77cde412c7.tar.gz linux-3.10-c827ba4cb49a30ce581201fd0ba2be77cde412c7.tar.bz2 linux-3.10-c827ba4cb49a30ce581201fd0ba2be77cde412c7.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Add PCI MSI support on Niagara.
[SPARC64] IRQ: Use irq_desc->chip_data instead of irq_desc->handler_data
[SPARC64]: Add obppath sysfs attribute for SBUS and PCI devices.
[PARTITION]: Add whole_disk attribute.
Diffstat (limited to 'fs/partitions/msdos.c')
-rw-r--r-- | fs/partitions/msdos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 78443e07b3c..4ccec4cd136 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c @@ -165,7 +165,7 @@ parse_extended(struct parsed_partitions *state, struct block_device *bdev, put_partition(state, state->next, next, size); if (SYS_IND(p) == LINUX_RAID_PARTITION) - state->parts[state->next].flags = 1; + state->parts[state->next].flags = ADDPART_FLAG_RAID; loopct = 0; if (++state->next == state->limit) goto done; |