diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 22:59:44 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 22:59:44 +0400 |
| commit | bbbfb910d14988963fbc0b3fc5fc460daf21bf24 (patch) | |
| tree | d06629217c7b91f678ef821295f133c0ef6781fa /arch/arm/mach-s3c64xx/mach-smdk6410.c | |
| parent | d0a0c28cf178943afaf22f87957b73c47497cb4b (diff) | |
| parent | a739260d4e3d88c5c810b14231dbdce73665b0b2 (diff) | |
| download | linux-bbbfb910d14988963fbc0b3fc5fc460daf21bf24.tar.xz | |
Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux:
DMAENGINE: correct PL080 register header file
ARM: SAMSUNG: Fix on build warning about dependency in Kconfig
ARM: SMDK6410: Make virtual screen twice depth of real
ARM: S3C64XX: Update consistent DMA size to 8MiB
ARM: S3C64XX: Add audio support to SmartQ
ARM: S3C64XX: Framebuffer fix for SmartQ5
ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards
ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file
ARM: mach-real6410: add sdhc device support
ARM: mach-real6410: add dm9000 ethernet support for mach-real6410
ARM: S3C64XX: Support for Real6410
Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c
("remove pixclock" vs "Framebuffer fix for SmartQ5")
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 2d43128f939f..d498219fff1b 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -155,6 +155,8 @@ static struct s3c_fb_pd_win smdk6410_fb_win0 = { }, .max_bpp = 32, .default_bpp = 16, + .virtual_y = 480 * 2, + .virtual_x = 800, }; /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */ |