fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / partitions / mac.c

diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c
index bb22cdd..d4a0fad 100644 (file)
--- a/fs/partitions/mac.c
+++ b/fs/partitions/mac.c
@@ -6,12 +6,12 @@
  *  Re-organised Feb 1998 Russell King
  */
 
-#include <linux/config.h>
 #include <linux/ctype.h>
 #include "check.h"
 #include "mac.h"
 
 #ifdef CONFIG_PPC_PMAC
+#include <asm/machdep.h>
 extern void note_bootable_part(dev_t dev, int part, int goodness);
 #endif
 
@@ -74,12 +74,14 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
                        be32_to_cpu(part->start_block) * (secsize/512),
                        be32_to_cpu(part->block_count) * (secsize/512));
 
+               if (!strnicmp(part->type, "Linux_RAID", 10))
+                       state->parts[slot].flags = 1;
 #ifdef CONFIG_PPC_PMAC
                /*
                 * If this is the first bootable partition, tell the
                 * setup code, in case it wants to make this the root.
                 */
-               if (_machine == _MACH_Pmac) {
+               if (machine_is(powermac)) {
                        int goodness = 0;
 
                        mac_fix_string(part->processor, 16);