mac80211: QoS related cleanups

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

diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index 6d59c8efe3be2a1be4b1bb559bb506c551d3c213..62aef589eb940936d6adb53889165b4e1f17dba2 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)
@@ -40,6 +38,7 @@
 #define AGPIOC_DEALLOCATE _IOW (AGPIOC_BASE, 7, int)
 #define AGPIOC_BIND       _IOW (AGPIOC_BASE, 8, struct agp_bind*)
 #define AGPIOC_UNBIND     _IOW (AGPIOC_BASE, 9, struct agp_unbind*)
+#define AGPIOC_CHIPSET_FLUSH _IO (AGPIOC_BASE, 10)
 
 #define AGP_DEVICE      "/dev/agpgart"
 
@@ -112,6 +111,7 @@ typedef struct _agp_unbind {
 
 #else                          /* __KERNEL__ */
 #include <linux/mutex.h>
+#include <linux/agp_backend.h>
 
 #define AGPGART_MINOR 175
 
@@ -198,7 +198,7 @@ struct agp_file_private {
        struct agp_file_private *next;
        struct agp_file_private *prev;
        pid_t my_pid;
-       long access_flags;      /* long req'd for set_bit --RR */
+       unsigned long access_flags;     /* long req'd for set_bit --RR */
 };
 
 struct agp_front_data {