diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 22:08:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 22:08:06 -0400 |
| commit | 411f5c7a502769ccc0377c5ba36cb0b283847ba8 (patch) | |
| tree | 2c3a29671e3f923de48c55f94194849264a7bf53 /drivers/video/Kconfig | |
| parent | 6d7ed21d17e640b120b902a314143e5ef4917a70 (diff) | |
| parent | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (diff) | |
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
davinci: DM644x EVM: register MUSB device earlier
davinci: add spi devices on tnetv107x evm
davinci: add ssp config for tnetv107x evm board
davinci: add tnetv107x ssp platform device
spi: add ti-ssp spi master driver
mfd: add driver for sequencer serial port
ARM: EXYNOS4: Implement Clock gating for System MMU
ARM: EXYNOS4: Enhancement of System MMU driver
ARM: EXYNOS4: Add support for gpio interrupts
ARM: S5P: Add function to register gpio interrupt bank data
ARM: S5P: Cleanup S5P gpio interrupt code
ARM: EXYNOS4: Add missing GPYx banks
ARM: S3C64XX: Fix section mismatch from cpufreq init
ARM: EXYNOS4: Add keypad device to the SMDKV310
ARM: EXYNOS4: Update clocks for keypad
ARM: EXYNOS4: Update keypad base address
ARM: EXYNOS4: Add keypad device helpers
ARM: EXYNOS4: Add support for SATA on ARMLEX4210
plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
mach-u300: define a dummy filter function for coh901318
...
Fix up various conflicts in
- arch/arm/mach-exynos4/cpufreq.c
- arch/arm/mach-mxs/gpio.c
- drivers/net/Kconfig
- drivers/tty/serial/Kconfig
- drivers/tty/serial/Makefile
- drivers/usb/gadget/fsl_mxc_udc.c
- drivers/video/Kconfig
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index bfc62d1ee2f7..e6a8d8c0101d 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -2321,6 +2321,15 @@ config FB_JZ4740 | |||
| 2321 | help | 2321 | help |
| 2322 | Framebuffer support for the JZ4740 SoC. | 2322 | Framebuffer support for the JZ4740 SoC. |
| 2323 | 2323 | ||
| 2324 | config FB_MXS | ||
| 2325 | tristate "MXS LCD framebuffer support" | ||
| 2326 | depends on FB && ARCH_MXS | ||
| 2327 | select FB_CFB_FILLRECT | ||
| 2328 | select FB_CFB_COPYAREA | ||
| 2329 | select FB_CFB_IMAGEBLIT | ||
| 2330 | help | ||
| 2331 | Framebuffer support for the MXS SoC. | ||
| 2332 | |||
| 2324 | config FB_PUV3_UNIGFX | 2333 | config FB_PUV3_UNIGFX |
| 2325 | tristate "PKUnity v3 Unigfx framebuffer support" | 2334 | tristate "PKUnity v3 Unigfx framebuffer support" |
| 2326 | depends on FB && UNICORE32 && ARCH_PUV3 | 2335 | depends on FB && UNICORE32 && ARCH_PUV3 |