diff options
| author | John W. Linville | 2010-09-24 21:52:34 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-09-24 21:52:34 +0200 |
| commit | 29ad2facd47f8e37eab8b156e2c384fa181c8b4a (patch) | |
| tree | 25d4df186cd631810ff15a8e7d37cb6cdd806cdb /drivers/net/wireless/libertas | |
| parent | ath9k: make the driver specific rate control module optional (diff) | |
| parent | mac80211: fix use-after-free (diff) | |
| download | kernel-qcow2-linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.tar.gz kernel-qcow2-linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.tar.xz kernel-qcow2-linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 024e5ca7b7f3..0b3119d9c02c 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -122,7 +122,7 @@ struct if_sdio_card { const char *helper; const char *firmware; - u8 buffer[65536]; + u8 buffer[65536] __attribute__((aligned(4))); spinlock_t lock; struct if_sdio_packet *packets; |