diff options
| author | Danny Nold <dannynold@freescale.com> | 2012-02-22 12:59:38 -0600 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:23:15 +0800 |
| commit | a527da1c4561fbe4a9a0794cebd4dbd870899d1b (patch) | |
| tree | f976b5e4523852c505ac5d7d06581d90258fd137 /arch/arm/configs/imx6_defconfig | |
| parent | 4f7140cbfccb6bb51e85d7ba68337ce423b54599 (diff) | |
ENGR00174886-1 - EPDC fb: Don't register EPDC unless "epdc" kernel option set
- Add E Ink support as a default for MX6 platforms
- Conditionalize registration of EPDC-related modules based on "epdc"
kernel command line option
Signed-off-by: Danny Nold <dannynold@freescale.com>
Diffstat (limited to 'arch/arm/configs/imx6_defconfig')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 2b9ddad49946..899533ec3998 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1338,7 +1338,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX6639 is not set # CONFIG_SENSORS_MAX6642 is not set -# CONFIG_SENSORS_MAX17135 is not set +CONFIG_SENSORS_MAX17135=y # CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set @@ -1692,6 +1692,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -1733,7 +1734,8 @@ CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y # CONFIG_FB_MXC_CH7026 is not set # CONFIG_FB_MXC_TVOUT_CH7024 is not set # CONFIG_FB_MXC_ASYNC_PANEL is not set -# CONFIG_FB_MXC_EINK_PANEL is not set +CONFIG_FB_MXC_EINK_PANEL=y +# CONFIG_FB_MXC_EINK_AUTO_UPDATE_MODE is not set # CONFIG_FB_MXC_ELCDIF_FB is not set CONFIG_FB_MXC_HDMI=y |