diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 07:56:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 07:56:44 -0400 |
| commit | 73909f7a665991013dcff42a815fda76d3a7300a (patch) | |
| tree | 84bb9899e2204bf6af6fd4f249bb909c2a89faf8 /drivers/char/agp/agp.h | |
| parent | d6672c501852d577097f6757c311d937aca0b04b (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into core/urgent
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 81e14bea54bd..4bada0e8b812 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h | |||
| @@ -148,6 +148,9 @@ struct agp_bridge_data { | |||
| 148 | char minor_version; | 148 | char minor_version; |
| 149 | struct list_head list; | 149 | struct list_head list; |
| 150 | u32 apbase_config; | 150 | u32 apbase_config; |
| 151 | /* list of agp_memory mapped to the aperture */ | ||
| 152 | struct list_head mapped_list; | ||
| 153 | spinlock_t mapped_lock; | ||
| 151 | }; | 154 | }; |
| 152 | 155 | ||
| 153 | #define KB(x) ((x) * 1024) | 156 | #define KB(x) ((x) * 1024) |