Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

[karo-tx-linux.git] / drivers / bluetooth / btmrvl_drv.h

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index bed0ba630235b46fb796b20116f4ea11d414675b..90bda50dc4465757d2f8431f7bdc64295ba8bf88 100644 (file)
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -76,6 +76,7 @@ struct btmrvl_private {
        int (*hw_host_to_card) (struct btmrvl_private *priv,
                                u8 *payload, u16 nb);
        int (*hw_wakeup_firmware) (struct btmrvl_private *priv);
+       int (*hw_process_int_status) (struct btmrvl_private *priv);
        spinlock_t driver_lock;         /* spinlock used by driver */
 #ifdef CONFIG_DEBUG_FS
        void *debugfs_data;
@@ -118,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 */