2.5 alpha update

Meant to cc lkml as well, since this affects building generic kernels even if you don't configure in agp.

r~

----- Forwarded message from Richard Henderson <[email protected]> -----

Date: Tue, 20 May 2003 13:33:41 -0700
From: Richard Henderson <[email protected]>
To: Dave Jones <[email protected]>
Cc: Jeff Wiedemeier <[email protected]>
Subject: [agp] 2.5 alpha update
User-Agent: Mutt/1.4i

Mm. Looks like the alpha bits havn't compiled in a while now.

How does the following look? I don't have any of the hardware to try this, but at least it builds. Jeff, can you try to boot such a beast?

r~

===== arch/alpha/kernel/core_marvel.c 1.10 vs edited =====

@@ -1075,7 +1075,6 @@
 	/*
 	 * Fill it in.
 	 */
-	agp->type = ALPHA_CORE_AGP;
 	agp->hose = hose;
 	agp->private = NULL;
 	agp->ops = &marvel_agp_ops;

===== arch/alpha/kernel/core_titan.c 1.15 vs edited =====

@@ -763,7 +763,6 @@
 	/*
 	 * Fill it in.
 	 */
-	agp->type = ALPHA_CORE_AGP;
 	agp->hose = hose;
 	agp->private = port;
 	agp->ops = &titan_agp_ops;

===== drivers/char/agp/alpha-agp.c 1.6 vs edited =====

===== include/asm-alpha/agp_backend.h 1.1 vs edited =====

@@ -17,7 +17,6 @@
 } alpha_agp_mode;
 
 typedef struct _alpha_agp_info {
-	enum chipset_type type;
 	struct pci_controller *hose;
 	struct {
 		dma_addr_t bus_base;

----- End forwarded message -----