diff options
| author | Arnd Bergmann | 2012-05-02 17:07:03 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-05-02 17:07:03 +0200 |
| commit | ced62c33fc434b9d44118c9f35803af8088cc3fe (patch) | |
| tree | 34d1145899e0e5853c4d5b45162f86bbe46941ea /arch/arm/mach-omap1/mux.c | |
| parent | Merge tag 'arm-imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 int... (diff) | |
| parent | ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GP... (diff) | |
| download | kernel-qcow2-linux-ced62c33fc434b9d44118c9f35803af8088cc3fe.tar.gz kernel-qcow2-linux-ced62c33fc434b9d44118c9f35803af8088cc3fe.tar.xz kernel-qcow2-linux-ced62c33fc434b9d44118c9f35803af8088cc3fe.zip | |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
From: Sascha Hauer <s.hauer@pengutronix.de>
ARM: i.MX cleanups for 3.5
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (5 commits)
ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN
ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message
ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads
arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig
arm: imx: make various struct sys_timer static
Includes an update to 3.4-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/mux.c')
| -rw-r--r-- | arch/arm/mach-omap1/mux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 087dba0df47e..e9cc52d4cb28 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c @@ -27,6 +27,7 @@ #include <linux/io.h> #include <linux/spinlock.h> +#include <mach/hardware.h> #include <plat/mux.h> |