diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-29 18:08:11 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-29 18:08:11 +0000 |
commit | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (patch) | |
tree | bfed4f8c7ea3164afc75a85ab3624586c37c37f4 /arch/arm/mach-pxa/include/mach/pxafb.h | |
parent | 4655a0de36e8e903e99a8d152818e3aae86dae1a (diff) | |
parent | 198fc108ee4c2cd3f08954eae6a819c81c03214b (diff) | |
download | kernel_samsung_smdk4412-47992cbdaef2f18a47871b2ed01ad27f568c8b73.zip kernel_samsung_smdk4412-47992cbdaef2f18a47871b2ed01ad27f568c8b73.tar.gz kernel_samsung_smdk4412-47992cbdaef2f18a47871b2ed01ad27f568c8b73.tar.bz2 |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pxafb.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pxafb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index 4201a88..6932720 100644 --- a/arch/arm/mach-pxa/include/mach/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h @@ -113,6 +113,7 @@ struct pxafb_mach_info { unsigned int num_modes; unsigned int lcd_conn; + unsigned long video_mem_size; u_int fixed_modes:1, cmap_inverse:1, |