diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-12 21:20:47 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-12 21:20:47 -0700 |
commit | db6d842b8443ebac7b7b37264f992ce49dfb5208 (patch) | |
tree | 302e771043ca9fda2a5f7dc50cc54f26faa2d441 /drivers/video/fbdev/Kconfig | |
parent | c3df51333444b7404a5b62f3e96f7a5d5b4fd2db (diff) | |
parent | f86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff) | |
download | linux-db6d842b8443ebac7b7b37264f992ce49dfb5208.tar.bz2 |
Merge tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Merge "Samsung cleanup 2nd version for S5P SoCs for 3.17" from Kukjin Kim:
Cleanup S5P SoCs for 3.17
- removing s5p64x0 SoCs and s5pc100 SoC in mainline because
no more user and if it is required next time, it will be
supported with DT.
* tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
mtd: onenand: remove s5pc100 related onenand codes
spi: s3c64xx: remove s5pc100 related spi codes
gpio: samsung: remov s5pc100 related gpio codes
ARM: S5PC100: no more support S5PC100 SoC
video: fbdev: s3c-fb: remove s5p64x0 related fimd codes
spi: s3c64xx: remove s5p64x0 related spi codes
gpio: samsung: remove s5p64x0 related gpio codes
ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/video/fbdev/Kconfig')
-rw-r--r-- | drivers/video/fbdev/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 5edc7a054e03..92026d31bb48 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2025,8 +2025,8 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \ - ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) + depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \ + ARCH_S5PV210 || ARCH_EXYNOS) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT |