diff options
| author | Danny Nold <dannynold@freescale.com> | 2012-02-22 12:59:38 -0600 |
|---|---|---|
| committer | Danny Nold <dannynold@freescale.com> | 2012-02-22 13:30:27 -0600 |
| commit | b230853f1bdc1d450952cd4d95d5e2427f972152 (patch) | |
| tree | b19062d3547c46d1f2666fe36851bbe807f72803 /arch/arm/configs | |
| parent | c8aa4fe8d25b317f7b17c10f10d21e878bd390cb (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')
| -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 |