diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 18:20:29 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 18:20:29 +0100 |
| commit | acf346084bca289a00020a5c29c23673b801b380 (patch) | |
| tree | 1ab7f6eeefd0564d8fb708b858dc19c8b7e0a67c /arch/arm/mach-pxa/pxa25x.c | |
| parent | Merge tag 'tegra-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/t... (diff) | |
| parent | ARM: mx35: Setup the AIPS registers (diff) | |
| download | linux-acf346084bca289a00020a5c29c23673b801b380.tar.xz linux-acf346084bca289a00020a5c29c23673b801b380.zip | |
Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
i.MX35/5 AIPS setup
Includes sync up to 3.3-rc6
* tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: mx35: Setup the AIPS registers
ARM: mx5: Use common function for configuring AIPS
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 91e4f6c03766..00d6eacab8e4 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -25,7 +25,6 @@ #include <linux/suspend.h> #include <linux/syscore_ops.h> #include <linux/irq.h> -#include <linux/gpio.h> #include <asm/mach/map.h> #include <asm/suspend.h> |