diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /drivers/net/wireless/libertas/if_sdio.c | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
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 { | |||
| 124 | bool helper_allocated; | 124 | bool helper_allocated; |
| 125 | bool firmware_allocated; | 125 | bool firmware_allocated; |
| 126 | 126 | ||
| 127 | u8 buffer[65536]; | 127 | u8 buffer[65536] __attribute__((aligned(4))); |
| 128 | 128 | ||
| 129 | spinlock_t lock; | 129 | spinlock_t lock; |
| 130 | struct if_sdio_packet *packets; | 130 | struct if_sdio_packet *packets; |