diff options
| author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2009-01-29 10:07:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-13 10:33:44 +0100 |
| commit | ccfe30a7c8329e85ae426813a1060e27e2547dd1 (patch) | |
| tree | 3a1b77c46e084c4ea0236c315d949af72a678bf6 /arch/arm/mach-mx1 | |
| parent | i810: fix kernel crash fix when struct fb_var_screeninfo is supplied (diff) | |
| download | linux-ccfe30a7c8329e85ae426813a1060e27e2547dd1.tar.xz linux-ccfe30a7c8329e85ae426813a1060e27e2547dd1.zip | |
arm/imx2x: new IOMUX definitions
* removed iomux-mx1-mx2.h completely
* distributes the former contents to four different files (iomux-mx1.h,
iomux-mx21.h, iomux-mx27.h and the file iomux-mx2x.h, which is common to
both i.MX21 and i.MX27).
* adds all documented IOMUX definitions for i.MX21 and i.MX27
* fixes a few that were wrong (PD14_AOUT_FEC_CLR, PE16_AF_RTCK).
* don't silenly include <linux/io.h>
* and fixes all collateral damage from above
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx1')
| -rw-r--r-- | arch/arm/mach-mx1/devices.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx1/mx1ads.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c index 686d8d2dbb24..cea8f2c71192 100644 --- a/arch/arm/mach-mx1/devices.c +++ b/arch/arm/mach-mx1/devices.c @@ -23,6 +23,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/gpio.h> +#include <mach/irqs.h> #include <mach/hardware.h> static struct resource imx_csi_resources[] = { diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c index 2e4b185fe4a9..be7dd75ebbe1 100644 --- a/arch/arm/mach-mx1/mx1ads.c +++ b/arch/arm/mach-mx1/mx1ads.c @@ -24,7 +24,7 @@ #include <mach/hardware.h> #include <mach/common.h> #include <mach/imx-uart.h> -#include <mach/iomux-mx1-mx2.h> +#include <mach/iomux.h> #include "devices.h" /* |