diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:32 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:32 -0400 |
| commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 (patch) | |
| tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f /drivers/net/wireless/libertas/if_sdio.c | |
| parent | f899fc64cda8569d0529452aafc0da31c042df2e (diff) | |
| parent | db8c076b9206ea35b1f7299708d5510b17674db2 (diff) | |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.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 ba854c70ab94..87b634978b35 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
| @@ -128,7 +128,7 @@ struct if_sdio_card { | |||
| 128 | bool helper_allocated; | 128 | bool helper_allocated; |
| 129 | bool firmware_allocated; | 129 | bool firmware_allocated; |
| 130 | 130 | ||
| 131 | u8 buffer[65536]; | 131 | u8 buffer[65536] __attribute__((aligned(4))); |
| 132 | 132 | ||
| 133 | spinlock_t lock; | 133 | spinlock_t lock; |
| 134 | struct if_sdio_packet *packets; | 134 | struct if_sdio_packet *packets; |