diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-22 04:03:02 -0500 |
| commit | 6552ebae25ffd57574c6e72d17fce67fea08b918 (patch) | |
| tree | cde6cc932c7e47d818154b011dfd8a6997d5c18e /include/linux/agpgart.h | |
| parent | 749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff) | |
| parent | 336f6c322d87806ef93afad6308ac65083a865e5 (diff) | |
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'include/linux/agpgart.h')
| -rw-r--r-- | include/linux/agpgart.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index c8fdb6e658e1..110c600c885f 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | 52 | ||
| 53 | #ifndef __KERNEL__ | 53 | #ifndef __KERNEL__ |
| 54 | #include <linux/types.h> | 54 | #include <linux/types.h> |
| 55 | #include <asm/types.h> | ||
| 56 | 55 | ||
| 57 | struct agp_version { | 56 | struct agp_version { |
| 58 | __u16 major; | 57 | __u16 major; |