diff options
| author | Tom Rini <trini@ti.com> | 2013-12-06 07:19:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-06 07:19:09 -0500 |
| commit | 3f56795635ab419d3378451a9291490cfa47f472 (patch) | |
| tree | 9043dbaf750f7c4fd2162d8d4a2ea480dfe71860 /arch/blackfin/include | |
| parent | 1df99080cb6dea9216ee1925f03bd7cc35dc34c7 (diff) | |
| parent | 985e18d14e0cb3933311945d30de6357cf8be9df (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'arch/blackfin/include')
| -rw-r--r-- | arch/blackfin/include/asm/gpio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 376ec02b65..6ebcf01aff 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -72,7 +72,7 @@ #ifndef __ASSEMBLY__ -#ifdef CONFIG_ADI_GPIO1 +#ifndef CONFIG_ADI_GPIO2 void set_gpio_dir(unsigned, unsigned short); void set_gpio_inen(unsigned, unsigned short); void set_gpio_polar(unsigned, unsigned short); |