- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / ppc / platforms / prep_setup.c

diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 36ce9fd..bad053d 100644 (file)
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -645,7 +645,7 @@ static void __init prep_init_sound(void)
 static void __init
 prep_init_vesa(void)
 {
-#if     (defined(CONFIG_FB_VGA16) || defined(CONFIG_FB_VGA_16_MODULE) || \
+#if     (defined(CONFIG_FB_VGA16) || defined(CONFIG_FB_VGA16_MODULE) || \
         defined(CONFIG_FB_VESA))
        PPC_DEVICE *vgadev = NULL;
 
@@ -1127,7 +1127,7 @@ prep_init(unsigned long r3, unsigned long r4, unsigned long r5,
                _prep_type = _PREP_Motorola;
        }
 
-#ifdef CONFIG_PREP_PRESIDUAL
+#ifdef CONFIG_PREP_RESIDUAL
        /* Switch off all residual data processing if the user requests it */
        if (strstr(cmd_line, "noresidual") != NULL)
                        res = NULL;