Merge commit 'linus/master' into bkl/core

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / btmrvl_drv.h

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 872cb6cfcd0d6ea82306b66c18943fcfa023da55..90bda50dc4465757d2f8431f7bdc64295ba8bf88 100644 (file)
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -119,13 +119,13 @@ struct btmrvl_cmd {
        __le16 ocf_ogf;
        u8 length;
        u8 data[4];
-} __attribute__ ((packed));
+} __packed;
 
 struct btmrvl_event {
        u8 ec;          /* event counter */
        u8 length;
        u8 data[4];
-} __attribute__ ((packed));
+} __packed;
 
 /* Prototype of global function */