X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fpartitions%2Fmac.c;h=bb22cdd0cb1433b8b05b8427ffb43c107f8f591e;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=c0871002d00d00f8c036d8b3a873f5a7e31a765b;hpb=3944158a6d33f94668dbd6bdc32ff5c67bb53ec2;p=linux-2.6.git

diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c
index c0871002d..bb22cdd0c 100644
--- 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_is(powermac)) {
+		if (_machine == _MACH_Pmac) {
 			int goodness = 0;
 
 			mac_fix_string(part->processor, 16);