diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
| commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
| tree | 39eb7e8e06737b295007126f4e16c1b688427163 /drivers/bcma | |
| parent | 1049f6413f6e52572a768ca1590fa479ef0a48e8 (diff) | |
| parent | 9a4ba833a2d0016cf836827e136f0c219834bd41 (diff) | |
| download | op-kernel-dev-df2cbe40753dc36af294c30209ed909869aca6cf.zip op-kernel-dev-df2cbe40753dc36af294c30209ed909869aca6cf.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index ba15105..08a14a3 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -7,6 +7,7 @@ #include "bcma_private.h" #include <linux/bcma/bcma.h> +#include <linux/slab.h> MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); MODULE_LICENSE("GPL"); |
