fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / agpgart.h

diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index ff4c2c0..bfb8ec7 100644 (file)
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
@@ -27,8 +27,6 @@
 #ifndef _AGP_H
 #define _AGP_H 1
 
-#include <linux/agp_backend.h>
-
 #define AGPIOC_BASE       'A'
 #define AGPIOC_INFO       _IOR (AGPIOC_BASE, 0, struct agp_info*)
 #define AGPIOC_ACQUIRE    _IO  (AGPIOC_BASE, 1)
@@ -64,7 +62,7 @@ typedef struct _agp_info {
        struct agp_version version;     /* version of the driver        */
        __u32 bridge_id;        /* bridge vendor/device         */
        __u32 agp_mode;         /* mode info of bridge          */
-       off_t aper_base;        /* base of aperture             */
+       unsigned long aper_base;/* base of aperture             */
        size_t aper_size;       /* size of aperture             */
        size_t pg_total;        /* max pages (swap + system)    */
        size_t pg_system;       /* max pages (system)           */
@@ -111,6 +109,8 @@ typedef struct _agp_unbind {
 } agp_unbind;
 
 #else                          /* __KERNEL__ */
+#include <linux/mutex.h>
+#include <linux/agp_backend.h>
 
 #define AGPGART_MINOR 175
 
@@ -118,7 +118,7 @@ struct agp_info {
        struct agp_version version;     /* version of the driver        */
        u32 bridge_id;          /* bridge vendor/device         */
        u32 agp_mode;           /* mode info of bridge          */
-       off_t aper_base;        /* base of aperture             */
+       unsigned long aper_base;/* base of aperture             */
        size_t aper_size;       /* size of aperture             */
        size_t pg_total;        /* max pages (swap + system)    */
        size_t pg_system;       /* max pages (system)           */
@@ -201,7 +201,7 @@ struct agp_file_private {
 };
 
 struct agp_front_data {
-       struct semaphore agp_mutex;
+       struct mutex agp_mutex;
        struct agp_controller *current_controller;
        struct agp_controller *controllers;
        struct agp_file_private *file_priv_list;