diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:46:42 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:46:42 +0100 |
commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/mach-tegra/board-trimslice-pinmux.c | |
parent | Merge branch 'tegra/devel' into next/devel (diff) | |
parent | ARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff) | |
download | linux-dev-efa62e1355f0495f37f1296754b8880947c8da72.tar.xz linux-dev-efa62e1355f0495f37f1296754b8880947c8da72.zip |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/board-trimslice-pinmux.c')
-rw-r--r-- | arch/arm/mach-tegra/board-trimslice-pinmux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c index 8417ba77f765..4969dd28a04c 100644 --- a/arch/arm/mach-tegra/board-trimslice-pinmux.c +++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c @@ -13,12 +13,11 @@ * GNU General Public License for more details. * */ - +#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <mach/pinmux.h> -#include <mach/gpio.h> #include "gpio-names.h" #include "board-trimslice.h" |