diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:01:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:01:27 -0800 |
| commit | 407f3fd8faf80f77c47ebda7501c6a8698d2f3a6 (patch) | |
| tree | 3b41623f7174f1bee5b31853d2b295028cf9e376 /drivers/video | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | 1d06825b0ede541f63b5577435abd2fc649a9b5e (diff) | |
| download | linux-3.10-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.tar.gz linux-3.10-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.tar.bz2 linux-3.10-407f3fd8faf80f77c47ebda7501c6a8698d2f3a6.zip | |
Merge 3.2-rc5 into staging-next
This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/omapfb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig index 83d3fe7ec9a..4ea17dc3258 100644 --- a/drivers/video/omap2/omapfb/Kconfig +++ b/drivers/video/omap2/omapfb/Kconfig @@ -1,6 +1,6 @@ menuconfig FB_OMAP2 tristate "OMAP2+ frame buffer support" - depends on FB && OMAP2_DSS + depends on FB && OMAP2_DSS && !DRM_OMAP select OMAP2_VRAM select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3 |