Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-ppc / machdep.h

diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index 2723b423f6757be06a7fbf55c5612fc52926142a..e1a0a7b213d7bdbc313cf043572e1983f0304b3a 100644 (file)
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -19,6 +19,18 @@ struct pci_dev;
 struct seq_file;
 struct file;
 
+/*
+ * This is for compatibility with ARCH=powerpc.
+ */
+#define machine_is(x)  __MACHINE_IS_##x
+#define __MACHINE_IS_powermac  0
+#define __MACHINE_IS_chrp      0
+#ifdef CONFIG_PPC_PREP
+#define __MACHINE_IS_prep      1
+#else
+#define __MACHINE_IS_prep      0
+#endif
+
 /* We export this macro for external modules like Alsa to know if
  * ppc_md.feature_call is implemented or not
  */