diff options
author | Arnd Bergmann | 2011-10-31 22:44:18 +0100 |
---|---|---|
committer | Arnd Bergmann | 2011-10-31 22:44:18 +0100 |
commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-mmp/jasper.c | |
parent | Merge branch 'pxa/fixes' into next/fixes (diff) | |
parent | ARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff) | |
download | kernel-qcow2-linux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.gz kernel-qcow2-linux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.xz kernel-qcow2-linux-43872fa788060eef91ae437957e0a5e39f1c56fd.zip |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp/jasper.c')
-rw-r--r-- | arch/arm/mach-mmp/jasper.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/jasper.c b/arch/arm/mach-mmp/jasper.c index 5d6421d63254..8bfac6612623 100644 --- a/arch/arm/mach-mmp/jasper.c +++ b/arch/arm/mach-mmp/jasper.c @@ -14,7 +14,6 @@ #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/io.h> -#include <linux/gpio.h> #include <linux/regulator/machine.h> #include <linux/regulator/max8649.h> #include <linux/mfd/max8925.h> |