diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:30 +0200 |
| commit | 6ab561c8aab2e4af535f09adbc6253f958536848 (patch) | |
| tree | 37846adb4ea106485720d113e252d71d615c23ed /drivers/net/wireless/p54/p54pci.h | |
| parent | ALSA: usb: USB3 SuperSpeed sound support (diff) | |
| parent | ALSA: ISA: Remove snd-sgalaxy (diff) | |
| download | linux-6ab561c8aab2e4af535f09adbc6253f958536848.tar.xz linux-6ab561c8aab2e4af535f09adbc6253f958536848.zip | |
Merge branch 'topic/isa' into topic/misc
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.h')
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h index 2feead617a3b..ee9bc62a4fa2 100644 --- a/drivers/net/wireless/p54/p54pci.h +++ b/drivers/net/wireless/p54/p54pci.h @@ -65,7 +65,7 @@ struct p54p_csr { u8 unused_6[1924]; u8 cardbus_cis[0x800]; u8 direct_mem_win[0x1000]; -} __attribute__ ((packed)); +} __packed; /* usb backend only needs the register defines above */ #ifndef P54USB_H @@ -74,7 +74,7 @@ struct p54p_desc { __le32 device_addr; __le16 len; __le16 flags; -} __attribute__ ((packed)); +} __packed; struct p54p_ring_control { __le32 host_idx[4]; @@ -83,7 +83,7 @@ struct p54p_ring_control { struct p54p_desc tx_data[32]; struct p54p_desc rx_mgmt[4]; struct p54p_desc tx_mgmt[4]; -} __attribute__ ((packed)); +} __packed; #define P54P_READ(r) (__force __le32)__raw_readl(&priv->map->r) #define P54P_WRITE(r, val) __raw_writel((__force u32)(__le32)(val), &priv->map->r) |