Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / fs / partitions / mac.c

diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c
index bb22cdd..c087100 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
 
@@ -79,7 +79,7 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
                 * 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);