diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2003-02-10 17:43:40 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2003-02-10 17:43:40 -0100 |
| commit | 3d9d68595649eacc0fee8d6cae3081ee78cd9c4a (patch) | |
| tree | 5c4ef4501f8beed4b2e3526a909b370a75d79688 /include | |
| parent | f2478c00b58e9e3da93e42302ac485cdf377797f (diff) | |
| parent | 13d5e170972196f97a3089170803de768f215c70 (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart-respin
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/agp_backend.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 36568e4a3d14..c16f1af37fc9 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -53,17 +53,6 @@ enum chipset_type { INTEL_460GX, INTEL_I7505, VIA_GENERIC, - VIA_VP3, - VIA_MVP3, - VIA_MVP4, - VIA_APOLLO_PRO, - VIA_APOLLO_KX133, - VIA_APOLLO_KT133, - VIA_APOLLO_KT400, - VIA_APOLLO_KT400_3, - VIA_APOLLO_PRO_266, - VIA_VT8605, - VIA_P4X, SIS_GENERIC, AMD_GENERIC, AMD_IRONGATE, @@ -84,6 +73,7 @@ enum chipset_type { SVWRKS_LE, SVWRKS_GENERIC, HP_ZX1, + ALPHA_CORE_AGP, }; struct agp_version { @@ -102,6 +92,7 @@ typedef struct _agp_kern_info { int current_memory; int cant_use_aperture; unsigned long page_mask; + struct vm_operations_struct *vm_ops; } agp_kern_info; /* |