diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-16 14:09:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-16 14:09:34 -0700 |
| commit | 300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch) | |
| tree | 7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /arch/arm/plat-samsung/include/plat/fb.h | |
| parent | 0a492896ac07336c98f37ad7fab4a6387b6ada78 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
| download | linux-3.10-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.gz linux-3.10-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.bz2 linux-3.10-300a103d1504134f8c4a7e831f995e917ea9b1e4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/fb.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/fb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h index 27d3b497b55..cb3ca3adc68 100644 --- a/arch/arm/plat-samsung/include/plat/fb.h +++ b/arch/arm/plat-samsung/include/plat/fb.h @@ -42,6 +42,7 @@ struct s3c_fb_pd_win { * @setup_gpio: Setup the external GPIO pins to the right state to transfer * the data from the display system to the connected display * device. + * @default_win: default window layer number to be used for UI layer. * @vidcon0: The base vidcon0 values to control the panel data format. * @vidcon1: The base vidcon1 values to control the panel data output. * @win: The setup data for each hardware window, or NULL for unused. @@ -58,6 +59,8 @@ struct s3c_fb_platdata { struct s3c_fb_pd_win *win[S3C_FB_MAX_WIN]; + u32 default_win; + u32 vidcon0; u32 vidcon1; }; |