diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /include/linux/agpgart.h | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
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__ */ |