Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / drivers / misc / mei / mei_dev.h

diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index fc7728bb84b1aa4e1c19b67b313d0dd0165ec6b1..4250555d5e72a2e29a5721de1fb0e790bc5747de 100644 (file)
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -529,7 +529,7 @@ struct mei_device {
        DECLARE_BITMAP(host_clients_map, MEI_CLIENTS_MAX);
        unsigned long me_client_index;
 
-       u32 allow_fixed_address;
+       bool allow_fixed_address;
 
        struct mei_cl wd_cl;
        enum mei_wd_states wd_state;