Merge commit 'v3.3-rc6' into next

[~andy/linux] / drivers / memstick / host / jmb38x_ms.c

diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 6ce70e9615d342660f7da9e71339ffad4c3087a3..5319e9b65847e0749b033f6e55a5d0a82261ef21 100644 (file)
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -21,7 +21,7 @@
 
 #define DRIVER_NAME "jmb38x_ms"
 
-static int no_dma;
+static bool no_dma;
 module_param(no_dma, bool, 0644);
 
 enum {