diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/agpgart.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/agpgart.h')
| -rw-r--r-- | include/linux/agpgart.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 6d59c8efe3be..bfb8ec791b7b 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | #ifndef _AGP_H | 27 | #ifndef _AGP_H |
| 28 | #define _AGP_H 1 | 28 | #define _AGP_H 1 |
| 29 | 29 | ||
| 30 | #include <linux/agp_backend.h> | ||
| 31 | |||
| 32 | #define AGPIOC_BASE 'A' | 30 | #define AGPIOC_BASE 'A' |
| 33 | #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) | 31 | #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) |
| 34 | #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) | 32 | #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) |
| @@ -112,6 +110,7 @@ typedef struct _agp_unbind { | |||
| 112 | 110 | ||
| 113 | #else /* __KERNEL__ */ | 111 | #else /* __KERNEL__ */ |
| 114 | #include <linux/mutex.h> | 112 | #include <linux/mutex.h> |
| 113 | #include <linux/agp_backend.h> | ||
| 115 | 114 | ||
| 116 | #define AGPGART_MINOR 175 | 115 | #define AGPGART_MINOR 175 |
| 117 | 116 | ||