diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:11:42 -0400 |
| commit | f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch) | |
| tree | 0816c565d26ae24854616faa0d497be365c2fe8b /include/linux/agpgart.h | |
| parent | ee4311adf105f4d740f52e3948acc1d81598afcc (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'include/linux/agpgart.h')
| -rw-r--r-- | include/linux/agpgart.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 62aef589eb94..c8fdb6e658e1 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
| @@ -206,8 +206,8 @@ struct agp_front_data { | |||
| 206 | struct agp_controller *current_controller; | 206 | struct agp_controller *current_controller; |
| 207 | struct agp_controller *controllers; | 207 | struct agp_controller *controllers; |
| 208 | struct agp_file_private *file_priv_list; | 208 | struct agp_file_private *file_priv_list; |
| 209 | u8 used_by_controller; | 209 | bool used_by_controller; |
| 210 | u8 backend_acquired; | 210 | bool backend_acquired; |
| 211 | }; | 211 | }; |
| 212 | 212 | ||
| 213 | #endif /* __KERNEL__ */ | 213 | #endif /* __KERNEL__ */ |