diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-19 15:45:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-19 15:45:56 -0800 |
| commit | 90fcd610926a7d54d8d488faaa313109bb82f88a (patch) | |
| tree | 906e04ac830750d85881b7f7d5d41871215bf05c /include/linux | |
| parent | 2594cc27663236e1d1fd104ea5a2100324b62539 (diff) | |
| parent | c9fa3e712d5b951434dd5b44ece92f7a522c86c1 (diff) | |
Merge bk://linux-dj.bkbits.net/agpgart
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/agp_backend.h | 18 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 2 insertions, 18 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 905f5332177a..7936986c289e 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -96,23 +96,5 @@ extern void agp_enable(u32); extern int agp_backend_acquire(void); extern void agp_backend_release(void); -/* - * Interface between drm and agp code. When agp initializes, it makes - * the below structure available via inter_module_register(), drm might - * use it. Keith Owens <kaos@ocs.com.au> 28 Oct 2000. - */ -typedef struct { - void (*free_memory)(struct agp_memory *); - struct agp_memory * (*allocate_memory)(size_t, u32); - int (*bind_memory)(struct agp_memory *, off_t); - int (*unbind_memory)(struct agp_memory *); - void (*enable)(u32); - int (*acquire)(void); - void (*release)(void); - int (*copy_info)(struct agp_kern_info *); -} drm_agp_t; - -extern const drm_agp_t *drm_agp_p; - #endif /* __KERNEL__ */ #endif /* _AGP_BACKEND_H */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 710135a0567a..20afe3145d66 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2226,6 +2226,8 @@ #define PCI_DEVICE_ID_INTEL_82875_IG 0x257b #define PCI_DEVICE_ID_INTEL_82915G_HB 0x2580 #define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 +#define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590 +#define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592 #define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 #define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 #define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 |