Merge branch 'akpm-current/current'

[karo-tx-linux.git] / lib / dma-debug.c

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 40514eddb67053562978de2c06a8f12451175a98..af6262b4e02c62c11bbf6295abc22c38ca4bc5a1 100644 (file)
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -101,7 +101,7 @@ static LIST_HEAD(free_entries);
 static DEFINE_SPINLOCK(free_entries_lock);
 
 /* Global disable flag - will be set in case of an error */
-static u32 global_disable __read_mostly;
+static bool global_disable __read_mostly;
 
 /* Early initialization disable flag, set at the end of dma_debug_init */
 static bool dma_debug_initialized __read_mostly;