From: Victor Martinez Date: Fri, 9 Apr 2010 11:00:11 +0000 (+0000) Subject: Merged changes from 2.6-noeabi. Added framebuffer support. X-Git-Url: http://gitweb/?a=commitdiff_plain;h=3c93882bda31513bbc617bf71c6faba8a8db941f;p=kernel%2Fversatile.git Merged changes from 2.6-noeabi. Added framebuffer support. --- diff --git a/config-2.6.30.5 b/config-2.6.30.5 index d6ab423..7ed66ef 100644 --- a/config-2.6.30.5 +++ b/config-2.6.30.5 @@ -748,7 +748,6 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y # # I2C Hardware Bus support @@ -864,22 +863,16 @@ CONFIG_SSB_DRIVER_PCICORE=y # # Graphics support # -CONFIG_DRM=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_VIA is not set -# CONFIG_DRM_SAVAGE is not set +# CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_CFB_FILLRECT=m -CONFIG_FB_CFB_COPYAREA=m -CONFIG_FB_CFB_IMAGEBLIT=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set # CONFIG_FB_SYS_FILLRECT is not set # CONFIG_FB_SYS_COPYAREA is not set @@ -897,11 +890,11 @@ CONFIG_FB_CFB_IMAGEBLIT=m # # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set -CONFIG_FB_ARMCLCD=m +CONFIG_FB_ARMCLCD=y # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -CONFIG_FB_S1D13XXX=m +CONFIG_FB_S1D13XXX=y # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set