diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/libertas_tf/cmd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/libertas_tf/cmd.c')
| -rw-r--r-- | drivers/net/wireless/libertas_tf/cmd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c index 28790e03dc43..b620daf59ef7 100644 --- a/drivers/net/wireless/libertas_tf/cmd.c +++ b/drivers/net/wireless/libertas_tf/cmd.c | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | * the Free Software Foundation; either version 2 of the License, or (at | 7 | * the Free Software Foundation; either version 2 of the License, or (at |
| 8 | * your option) any later version. | 8 | * your option) any later version. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/slab.h> | ||
| 11 | |||
| 10 | #include "libertas_tf.h" | 12 | #include "libertas_tf.h" |
| 11 | 13 | ||
| 12 | static const struct channel_range channel_ranges[] = { | 14 | static const struct channel_range channel_ranges[] = { |