diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-22 13:47:49 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-22 13:47:49 +0100 |
| commit | 3cf42efc3479806bc5db5176fd440d23bb73854b (patch) | |
| tree | a6a0a57cbe89a4f779625f8ce6e8ebc7ea49f2c0 /arch/blackfin/kernel/debug-mmrs.c | |
| parent | 6ec9249a83b00a754af435ed57ad02ffed105d93 (diff) | |
| parent | 9d8cc89c316d9cc8ff269068ac8f904f13b5a70d (diff) | |
| download | linux-3cf42efc3479806bc5db5176fd440d23bb73854b.tar.bz2 | |
Merge branch 'devel' into for-next
Diffstat (limited to 'arch/blackfin/kernel/debug-mmrs.c')
| -rw-r--r-- | arch/blackfin/kernel/debug-mmrs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c index 86b1cd3a0309..e272bca93c64 100644 --- a/arch/blackfin/kernel/debug-mmrs.c +++ b/arch/blackfin/kernel/debug-mmrs.c @@ -11,9 +11,9 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/i2c/bfin_twi.h> +#include <linux/gpio.h> #include <asm/blackfin.h> -#include <asm/gpio.h> #include <asm/gptimers.h> #include <asm/bfin_can.h> #include <asm/bfin_dma.h> |