diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /drivers/net/wireless/b43/pcmcia.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/wireless/b43/pcmcia.c')
| -rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 984174bc7b0f..609e7051e018 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include "pcmcia.h" | 24 | #include "pcmcia.h" |
| 25 | 25 | ||
| 26 | #include <linux/ssb/ssb.h> | 26 | #include <linux/ssb/ssb.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <pcmcia/cs_types.h> | 29 | #include <pcmcia/cs_types.h> |
| 29 | #include <pcmcia/cs.h> | 30 | #include <pcmcia/cs.h> |