diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 13:16:17 -0500 |
| commit | f5237f278f30a92401539a54f87ee0c717b6f818 (patch) | |
| tree | 209d4fd6fb00e660c76ca8ac5d4caed59dbb9957 /drivers/bcma/driver_chipcommon_nflash.c | |
| parent | b285109dde7b873b5dc671ef1b3ae3090f4bc72f (diff) | |
| parent | b26f5f09ebdeb85ab152344cc1d6d484a3ce967d (diff) | |
| download | linux-f5237f278f30a92401539a54f87ee0c717b6f818.tar.gz linux-f5237f278f30a92401539a54f87ee0c717b6f818.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma/driver_chipcommon_nflash.c')
| -rw-r--r-- | drivers/bcma/driver_chipcommon_nflash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bcma/driver_chipcommon_nflash.c b/drivers/bcma/driver_chipcommon_nflash.c index 1f0b83e18f68..d4f699aef8c4 100644 --- a/drivers/bcma/driver_chipcommon_nflash.c +++ b/drivers/bcma/driver_chipcommon_nflash.c @@ -5,11 +5,11 @@ * Licensed under the GNU/GPL. See COPYING for details. */ +#include "bcma_private.h" + #include <linux/platform_device.h> #include <linux/bcma/bcma.h> -#include "bcma_private.h" - struct platform_device bcma_nflash_dev = { .name = "bcma_nflash", .num_resources = 0, |