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;
_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;