diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 09:12:24 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 09:13:41 +0400 |
| commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
| tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mach-omap1/devices.c | |
| parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
| parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
| download | linux-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.xz | |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
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> |