diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-02 18:06:03 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-02 18:06:03 -0800 |
| commit | 7cbe010a5ea728d7c4440b11a1a3997faca0e46d (patch) | |
| tree | 9132c4c60a236f58f532086a0d8b8cc3fdf180fc /drivers/video/fbdev/omap2/dss/rfbi.c | |
| parent | 9056be30542bfff51190bdda67088f319cf4c9f5 (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| download | op-kernel-dev-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.zip op-kernel-dev-7cbe010a5ea728d7c4440b11a1a3997faca0e46d.tar.gz | |
Merge 3.18-rc3 into staging-next
We want the upstream fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/rfbi.c')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/rfbi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/rfbi.c b/drivers/video/fbdev/omap2/dss/rfbi.c index c8a81a2..878273f 100644 --- a/drivers/video/fbdev/omap2/dss/rfbi.c +++ b/drivers/video/fbdev/omap2/dss/rfbi.c @@ -1044,6 +1044,7 @@ static struct platform_driver omap_rfbihw_driver = { .name = "omapdss_rfbi", .owner = THIS_MODULE, .pm = &rfbi_pm_ops, + .suppress_bind_attrs = true, }, }; |
