diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
| commit | ca8cdf043c7c6d8e1b4b3d86f3cae12fc37756a2 (patch) | |
| tree | dad605a1b3142e85d9ddc08a77d62f6bf09f22cc /arch/arm/configs/gta02_micro_defconfig | |
| parent | 16696dd08020690cff796fc4705b4d6bd14e91b0 (diff) | |
| parent | b4136a36f31a65d0998a328465df9e8e2ba93166 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Conflicts:
drivers/mfd/glamo/Kconfig
Diffstat (limited to 'arch/arm/configs/gta02_micro_defconfig')
| -rw-r--r-- | arch/arm/configs/gta02_micro_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/gta02_micro_defconfig b/arch/arm/configs/gta02_micro_defconfig index b81e96dbf09..ae30c4b1ddb 100644 --- a/arch/arm/configs/gta02_micro_defconfig +++ b/arch/arm/configs/gta02_micro_defconfig @@ -707,6 +707,7 @@ CONFIG_PCF50633_GPIO=y # CONFIG_MFD_PCF50606 is not set CONFIG_MFD_GLAMO=y CONFIG_MFD_GLAMO_FB=y +CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y CONFIG_MFD_GLAMO_SPI_GPIO=y CONFIG_MFD_GLAMO_SPI_FB=y CONFIG_MFD_GLAMO_MCI=y |