diff options
| author | Imre Deak <imre.deak@solidboot.com> | 2007-03-06 03:16:36 -0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-09 10:39:14 +0100 |
| commit | b7cc6d46b4f8157bfc58a6ed143ffa83575e236a (patch) | |
| tree | 107a080740734d99d32ee92372fd7a9c6de538f6 /arch/arm/mach-omap1 | |
| parent | b01d96d653b1387ee0a91094ee54a8c523c3be09 (diff) | |
| download | linux-b7cc6d46b4f8157bfc58a6ed143ffa83575e236a.tar.gz linux-b7cc6d46b4f8157bfc58a6ed143ffa83575e236a.tar.bz2 linux-b7cc6d46b4f8157bfc58a6ed143ffa83575e236a.zip | |
ARM: OMAP: FB sync with N800 tree (support for dynamic SRAM allocations)
- in addition to fixed FB regions - as passed by the bootloader -
allow dynamic allocations
- do some more checking against overlapping / reserved regions
- move the FB specific parts out from sram.c to fb.c
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index fab8b0b27cfb..81c4e738506c 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -17,11 +17,11 @@ #include <asm/io.h> #include <asm/arch/mux.h> #include <asm/arch/tc.h> -#include <asm/arch/omapfb.h> extern int omap1_clk_init(void); extern void omap_check_revision(void); extern void omap_sram_init(void); +extern void omapfb_reserve_sdram(void); /* * The machine specific code may provide the extra mapping besides the @@ -121,7 +121,7 @@ void __init omap1_map_common_io(void) #endif omap_sram_init(); - omapfb_reserve_mem(); + omapfb_reserve_sdram(); } /* |