diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-28 08:21:44 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-28 08:24:03 +0400 |
| commit | 1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544 (patch) | |
| tree | 41ea81fdecc67d766789ea3e46b1a49773dc8ec4 /arch/arm/mach-lpc32xx/common.h | |
| parent | 4788d72ce6c0d71220c06a242f935a056eccf424 (diff) | |
| parent | 489e7bece7f6859a7df484a4dce08fa51fb0d876 (diff) | |
| download | linux-1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544.tar.xz | |
Merge branch 'fixes-non-critical' into next/drivers2
fixes-non-critical has already been merged upstream, and there are a
handful of annoying context conflicts that it makes sense to resolve
before sending up. Part of this is because there was parallel development
going on between more urgent fixes and general driver fixups, it should
settle down once the lpc32xx platform reaches a more steady state.
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-lpc32xx/common.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-lpc32xx/common.h')
| -rw-r--r-- | arch/arm/mach-lpc32xx/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h index 23c21905ff89..68e45e8c9486 100644 --- a/arch/arm/mach-lpc32xx/common.h +++ b/arch/arm/mach-lpc32xx/common.h @@ -69,6 +69,7 @@ extern u32 clk_get_pclk_div(void); */ extern void lpc32xx_get_uid(u32 devid[4]); +extern u32 lpc32xx_return_iram_size(void); /* * Pointers used for sizing and copying suspend function data */ |