Merge branch 'linus' into x86/gart

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 2939e3570f9d..8c42dcc5958c 100644
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -141,9 +141,9 @@ parisc_agp_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
                 j++;
         }
 
-        if (mem->is_flushed == FALSE) {
+        if (!mem->is_flushed) {
                 global_cache_flush();
-                mem->is_flushed = TRUE;
+                mem->is_flushed = true;
         }
 
         for (i = 0, j = io_pg_start; i < mem->page_count; i++) {
@@ -226,7 +226,7 @@ static const struct agp_bridge_driver parisc_agp_driver = {
         .agp_alloc_page         = agp_generic_alloc_page,
         .agp_destroy_page       = agp_generic_destroy_page,
         .agp_type_to_mask_type  = agp_generic_type_to_mask_type,
-        .cant_use_aperture      = 1,
+        .cant_use_aperture      = true,
 };
 
 static int __init