diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/agp_backend.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/agp_backend.h')
| -rw-r--r-- | include/linux/agp_backend.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 03e34547d489..661d90d6cf7c 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h | |||
| @@ -30,8 +30,6 @@ | |||
| 30 | #ifndef _AGP_BACKEND_H | 30 | #ifndef _AGP_BACKEND_H |
| 31 | #define _AGP_BACKEND_H 1 | 31 | #define _AGP_BACKEND_H 1 |
| 32 | 32 | ||
| 33 | #ifdef __KERNEL__ | ||
| 34 | |||
| 35 | #ifndef TRUE | 33 | #ifndef TRUE |
| 36 | #define TRUE 1 | 34 | #define TRUE 1 |
| 37 | #endif | 35 | #endif |
| @@ -111,5 +109,4 @@ extern struct agp_bridge_data *agp_backend_acquire(struct pci_dev *); | |||
| 111 | extern void agp_backend_release(struct agp_bridge_data *); | 109 | extern void agp_backend_release(struct agp_bridge_data *); |
| 112 | extern void agp_flush_chipset(struct agp_bridge_data *); | 110 | extern void agp_flush_chipset(struct agp_bridge_data *); |
| 113 | 111 | ||
| 114 | #endif /* __KERNEL__ */ | ||
| 115 | #endif /* _AGP_BACKEND_H */ | 112 | #endif /* _AGP_BACKEND_H */ |