[PATCH] radeonfb x86_64 fix

Fix radeonfb and aty128fb on x86_64 by using the correct ifdef.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index b19eded6cb8b7c4f70e8b0584ea2bbf20c648f4a..f2f45501d50f3320b69e957d4fc295208d89ec27 100644 (file)
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -924,7 +924,7 @@ static void __init aty128_get_pllinfo(struct aty128fb_par *par, unsigned char *b
 
 }           
 
-#ifdef __i386__
+#ifdef CONFIG_X86
 static void *  __devinit aty128_find_mem_vbios(struct aty128fb_par *par)
 {
        /* I simplified this code as we used to miss the signatures in
@@ -946,7 +946,7 @@ static void *  __devinit aty128_find_mem_vbios(struct aty128fb_par *par)
         }
        return rom_base;
 }
-#endif /* __i386__ */
+#endif
 #endif /* ndef(__sparc__) */
 
 /* fill in known card constants if pll_block is not available */
@@ -1950,7 +1950,7 @@ static int __init aty128_probe(struct pci_dev *pdev, const struct pci_device_id
 
 #ifndef __sparc__
        bios = aty128_map_ROM(par, pdev);
-#ifdef __i386__
+#ifdef CONFIG_X86
        if (bios == NULL)
                bios = aty128_find_mem_vbios(par);
 #endif

diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 6b89587618cd3cd33cc411f13e359a283126634c..bd3b24caad4fbe8c29dd70f0b3bfc64d74d6beb3 100644 (file)
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -386,7 +386,7 @@ static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev
        return -ENXIO;
 }
 
-#ifdef __i386__
+#ifdef CONFIG_X86
 static int  __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo)
 {
        /* I simplified this code as we used to miss the signatures in
@@ -415,7 +415,7 @@ static int  __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo)
 
        return 0;
 }
-#endif /* __i386__ */
+#endif
 
 #ifdef CONFIG_PPC_OF
 /*
@@ -2277,13 +2277,13 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
        /*
         * On x86, the primary display on laptop may have it's BIOS
         * ROM elsewhere, try to locate it at the legacy memory hole.
-        * We probably need to make sure this is the primary dispay,
+        * We probably need to make sure this is the primary display,
         * but that is difficult without some arch support.
         */
-#ifdef __i386__
+#ifdef CONFIG_X86
        if (rinfo->bios_seg == NULL)
                radeon_find_mem_vbios(rinfo);
-#endif /* __i386__ */
+#endif
 
        /* If both above failed, try the BIOS ROM again for mobility
         * chips