diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /arch/arm/mach-imx/mx1ads.c | |
parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-imx/mx1ads.c')
-rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index 4cbdc1fe04b1..708e1b3faa14 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/platform_device.h> | ||
17 | #include <asm/system.h> | 18 | #include <asm/system.h> |
18 | #include <asm/hardware.h> | 19 | #include <asm/hardware.h> |
19 | #include <asm/irq.h> | 20 | #include <asm/irq.h> |