Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/main.c
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user