diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 07:27:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 07:27:33 +0200 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /drivers/net/wireless/libertas/if_sdio.c | |
| parent | drivers/net/bnx2x: use ARRAY_SIZE macro in bnx2x_main.c (diff) | |
| parent | Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... (diff) | |
| download | linux-e548833df83c3554229eff0672900bfe958b45fd.tar.xz linux-e548833df83c3554229eff0672900bfe958b45fd.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'drivers/net/wireless/libertas/if_sdio.c')
| -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 1bbaaa44d981..296fd00a5129 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -124,7 +124,7 @@ struct if_sdio_card { bool helper_allocated; bool firmware_allocated; - u8 buffer[65536]; + u8 buffer[65536] __attribute__((aligned(4))); spinlock_t lock; struct if_sdio_packet *packets; |