- 2.6.17 port work build breaks, but the patch set is relativly stable

[linux-flexiantxendom0-3.2.10.git] / arch / powerpc / platforms / powermac / bootx_init.c

diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index fa8b4d7..eacbfd9 100644 (file)
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -161,9 +161,7 @@ static void __init bootx_dt_add_prop(char *name, void *data, int size,
 static void __init bootx_add_chosen_props(unsigned long base,
                                          unsigned long *mem_end)
 {
-       u32 val = _MACH_Pmac;
-
-       bootx_dt_add_prop("linux,platform", &val, 4, mem_end);
+       u32 val;
 
        if (bootx_info->kernelParamsOffset) {
                char *args = (char *)((unsigned long)bootx_info) +
@@ -493,7 +491,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
                    && (strcmp(model, "iMac,1") == 0
                        || strcmp(model, "PowerMac1,1") == 0)) {
                        bootx_printf("iMac,1 detected, shutting down USB \n");
-                       out_le32((unsigned *)0x80880008, 1);    /* XXX */
+                       out_le32((unsigned __iomem *)0x80880008, 1);    /* XXX */
                }
        }