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 /drivers/mfd/glamo/Kconfig | |
| parent | 16696dd08020690cff796fc4705b4d6bd14e91b0 (diff) | |
| parent | b4136a36f31a65d0998a328465df9e8e2ba93166 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Conflicts:
drivers/mfd/glamo/Kconfig
Diffstat (limited to 'drivers/mfd/glamo/Kconfig')
| -rw-r--r-- | drivers/mfd/glamo/Kconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index 4410d1e3245..eaa415df890 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -22,6 +22,16 @@ config MFD_GLAMO_FB If unsure, say N. +config MFD_GLAMO_FB_XGLAMO_WORKAROUND + bool "Smedia Glamo 336x/337x Xglamo rotation workaround" + depends on MFD_GLAMO_FB + help + This is a workaround for a Xglamo bug. This should be fixed + in Xglamo and not in kernel space. + + If unsure, say N. + + config MFD_GLAMO_SPI_GPIO tristate "Glamo GPIO SPI bitbang support" depends on MFD_GLAMO @@ -45,6 +55,7 @@ config MFD_GLAMO_MCI neo1973 GTA-02. If unsure, say N. + config MFD_GLAMO_DRM tristate "Glamo DRM support" depends on MFD_GLAMO && DRM @@ -53,4 +64,3 @@ config MFD_GLAMO_DRM used in Openmoko neo1973 GTA-02. If unsure, say N. - |