diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-26 04:59:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-26 04:59:50 +0400 |
| commit | 32e6e5c34416672183caaddf16355f01d295e620 (patch) | |
| tree | 90e663b39c40c5775b2a99cd8245c8db2b3be26a /arch/blackfin/mach-bf561/boards/cm_bf561.c | |
| parent | 0e6103e5e728db166df2d868263a68d07eaa1326 (diff) | |
| parent | b76f98236a23f808d6e3a27f7292670bc1d2c21b (diff) | |
| download | linux-32e6e5c34416672183caaddf16355f01d295e620.tar.xz | |
Merge tag 'blackfin-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin fixes from Steven Miao:
"smc nor flash PM fix, pinctrl group fix, update defconfig, and build
fixes"
* tag 'blackfin-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: vmlinux.lds.S: reserve 32 bytes space at the end of data section for XIP kernel
defconfig: BF609: update spi config name
irq: blackfin sec: drop duplicated sec priority set
blackfin: bind different groups of one pinmux function to different state name
blackfin: fix some bf5xx boards build for missing <linux/gpio.h>
pm: bf609: cleanup smc nor flash
Diffstat (limited to 'arch/blackfin/mach-bf561/boards/cm_bf561.c')
| -rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 9f777df4cacc..e862f7823e68 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c @@ -18,6 +18,7 @@ #endif #include <linux/ata_platform.h> #include <linux/irq.h> +#include <linux/gpio.h> #include <asm/dma.h> #include <asm/bfin5xx_spi.h> #include <asm/portmux.h> |