diff options
| author | Richard Henderson <rth@kanga.twiddle.net> | 2003-01-15 22:38:20 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@dorothy.sfbay.redhat.com> | 2003-01-15 22:38:20 -0800 |
| commit | 29a54be1c650fa08990858162c2242780da59425 (patch) | |
| tree | 1052cedff926caffa2b0c9c920ebcd1013c94cbc | |
| parent | f0bde625eba3c02d9cfbb88a305f2a19689ee6e5 (diff) | |
[ALPHA] Fixups to Marvel and Titan for incomplete merging
of AGP and SRMCONS patches.
| -rw-r--r-- | arch/alpha/kernel/core_marvel.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/core_titan.c | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index a7462bd62512..7067288cfefc 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/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; diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 20fd7957aadd..1b3c8de9d7bd 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/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; diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 7f12489a4133..ce226e1969d0 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/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, |