diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:28:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:28:32 -0700 |
| commit | 88fa08f67bee1a0c765237bdac106a32872f57d2 (patch) | |
| tree | 6f15f1b4f236b7a5b32b0ce997c2822470a37203 /drivers/char/agp/agp.h | |
| parent | 1ea2950884aa320c46315c8ddf62717c6ecf78d0 (diff) | |
| parent | 91397585e3fb47b3900e17d70c6edc356e36bb46 (diff) | |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp: fix SIS 5591/5592 wrong PCI id
intel/agp: rewrite GTT on resume
agp: use dev_printk when possible
amd64-agp: run fallback when no bridges found, not when driver registration fails
intel_agp: official name for GM45 chipset
Diffstat (limited to 'drivers/char/agp/agp.h')
| -rw-r--r-- | drivers/char/agp/agp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index 81e14bea54b..4bada0e8b81 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -148,6 +148,9 @@ struct agp_bridge_data { char minor_version; struct list_head list; u32 apbase_config; + /* list of agp_memory mapped to the aperture */ + struct list_head mapped_list; + spinlock_t mapped_lock; }; #define KB(x) ((x) * 1024) |