diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
commit | 5d641e7bbb8ed48f231bc902eecab2cc598f34a4 (patch) | |
tree | 1be4ef1941355af508cc203838560a50707851bc /include/linux/agp_backend.h | |
parent | 9ae76f5d8ab546660cf517bb63c64de51800955d (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-25_10.24_Wed
Diffstat (limited to 'include/linux/agp_backend.h')
-rw-r--r-- | include/linux/agp_backend.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index 661d90d6cf7c..972b12bcfb36 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -30,14 +30,6 @@ #ifndef _AGP_BACKEND_H #define _AGP_BACKEND_H 1 -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - enum chipset_type { NOT_SUPPORTED, SUPPORTED, @@ -57,7 +49,7 @@ struct agp_kern_info { size_t aper_size; int max_memory; /* In pages */ int current_memory; - int cant_use_aperture; + bool cant_use_aperture; unsigned long page_mask; struct vm_operations_struct *vm_ops; }; @@ -83,9 +75,9 @@ struct agp_memory { off_t pg_start; u32 type; u32 physical; - u8 is_bound; - u8 is_flushed; - u8 vmalloc_flag; + bool is_bound; + bool is_flushed; + bool vmalloc_flag; }; #define AGP_NORMAL_MEMORY 0 |