diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:33:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:33:36 +1000 |
| commit | 21e8b41e6b096358683de4b119f0c4a3359f4ec8 (patch) | |
| tree | 1fc1d4b4ec2f97e6156d7345f6c135610b566e28 /include | |
| parent | 5aa8ab5bf86d3a4475f5c21dcf68715319d40cee (diff) | |
| parent | 3712d8e6b03e0b46e7371e56bd55c0a76e941aef (diff) | |
Merge remote branch 'arm/devel'
Conflicts:
arch/arm/configs/lusl7200_defconfig
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omapfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 9bdd91486b49..45707bed8c19 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -253,7 +253,7 @@ struct omapfb_platform_data { /* in arch/arm/plat-omap/fb.c */ extern void omapfb_set_platform_data(struct omapfb_platform_data *data); extern void omapfb_set_ctrl_platform_data(void *pdata); -extern void omapfb_reserve_sdram(void); +extern void omapfb_reserve_sdram_lmb(void); #endif |