Merge branch 'x86/urgent' into x86/pat

[cascardo/linux.git] / drivers / char / agp / agp.h

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 338b0b4..46f5075 100644 (file)
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -150,6 +150,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)