[ALPHA] Fixups to Marvel and Titan for incomplete merging

of AGP and SRMCONS patches.

arch/alpha/kernel/core_marvel.c

@@ -1069,7 +1069,7 @@ marvel_agp_info(void)
 	/*
 	 * Fill it in
 	 */
-	agp->type = ALPHA_CORE_AGP;
+	agp->type = 0 /* FIXME: ALPHA_CORE_AGP */;
 	agp->hose = hose;
 	agp->private = NULL;
 	agp->ops = &marvel_agp_ops;

arch/alpha/kernel/core_titan.c

@@ -755,7 +755,7 @@ titan_agp_info(void)
 	/*
 	 * Fill it in
 	 */
-	agp->type = ALPHA_CORE_AGP;
+	agp->type = 0 /* FIXME: ALPHA_CORE_AGP */;
 	agp->hose = hose;
 	agp->private = port;
 	agp->ops = &titan_agp_ops;

arch/alpha/kernel/sys_marvel.c

@@ -490,7 +490,6 @@ struct alpha_machine_vector marvel_ev7_mv __initmv = {
 	.device_interrupt	= io7_device_interrupt,
 
 	.agp_info		= marvel_agp_info,
-	.srmcons_allowed	= marvel_srmcons_allowed,
 
 	.smp_callin		= marvel_smp_callin,
 	.init_arch		= marvel_init_arch,