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.

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c
index 78443e07b3c4..4ccec4cd1367 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;