diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:45:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:45:51 +0100 |
| commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
| tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mach-omap1/devices.c | |
| parent | Linux 3.2-rc4 (diff) | |
| parent | arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF (diff) | |
| download | linux-e5570bbc9c06634cfac94e06ac1432b53d8595e5.tar.xz linux-e5570bbc9c06634cfac94e06ac1432b53d8595e5.zip | |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
| -rw-r--r-- | arch/arm/mach-omap1/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 475cb2f50d87..1d76a63c0983 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -22,7 +22,7 @@ #include <mach/hardware.h> #include <asm/mach/map.h> -#include <plat/common.h> +#include "common.h" #include <plat/tc.h> #include <plat/board.h> #include <plat/mux.h> |