diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 21:01:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 21:01:18 -0700 |
| commit | 2bc856c419d9941589ff210900a60906d773f1c4 (patch) | |
| tree | 6b6a034d2d61c4b0f0f3bb59c673dd7b16d19c11 /arch/arm/mach-omap2/clock44xx_data.c | |
| parent | 13d0dff8937f911a0812f95871873288e14c56e2 (diff) | |
| parent | a2a47ca36642e3995e982957bc42678cf11ca6ac (diff) | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into devel/io-cleanup
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
Diffstat (limited to 'arch/arm/mach-omap2/clock44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 79b98f22f20..c03c1108468 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -26,6 +26,7 @@ #include <linux/kernel.h> #include <linux/list.h> #include <linux/clk.h> +#include <linux/io.h> #include <plat/hardware.h> #include <plat/clkdev_omap.h> |