diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/linux/agpgart.h | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
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 | ||