diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-11 19:48:14 -0800 |
commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /drivers/video/fbdev/omap2/dss/hdmi_phy.c | |
parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/hdmi_phy.c')
-rw-r--r-- | drivers/video/fbdev/omap2/dss/hdmi_phy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/dss/hdmi_phy.c index bc9e07d2afbe..1f5d19c119ce 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi_phy.c +++ b/drivers/video/fbdev/omap2/dss/hdmi_phy.c @@ -208,6 +208,7 @@ static int hdmi_phy_init_features(struct platform_device *pdev) break; case OMAPDSS_VER_OMAP5: + case OMAPDSS_VER_DRA7xx: src = &omap54xx_phy_feats; break; |