diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-04 22:57:19 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-04 22:57:19 -0700 |
| commit | e6c340171f0daaccc95b90abbeed2b837157ee11 (patch) | |
| tree | 843d4035be59bd791321910e52157ce527b3b4b3 /arch/arm/plat-omap/common.c | |
| parent | a85442ade272121927a56e02f7dfde1127482df2 (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
| download | talos-op-linux-e6c340171f0daaccc95b90abbeed2b837157ee11.tar.gz talos-op-linux-e6c340171f0daaccc95b90abbeed2b837157ee11.zip | |
Merge tag 'v3.6-rc4' into next
Linux 3.6-rc4
# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 0a9b9a970113..89a3723b3538 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -77,3 +77,12 @@ void __init omap_init_consistent_dma_size(void) init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); #endif } + +/* + * Stub function for OMAP2 so that common files + * continue to build when custom builds are used + */ +int __weak omap_secure_ram_reserve_memblock(void) +{ + return 0; +} |
