diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-19 01:24:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-19 01:24:22 -0500 |
| commit | 1e8d6421cff2c24fe0b345711e7a21af02e8bcf5 (patch) | |
| tree | 773b30106efb9b48055bc93958e5a94ac53768ce /drivers/video/omap2/dss/dpi.c | |
| parent | f7b12606b5de323a2bb5ca1696558efde8f25441 (diff) | |
| parent | 960dfc4eb23a28495276b02604d7458e0e1a1ed8 (diff) | |
| download | op-kernel-dev-1e8d6421cff2c24fe0b345711e7a21af02e8bcf5.zip op-kernel-dev-1e8d6421cff2c24fe0b345711e7a21af02e8bcf5.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c
Two minor conflicts in bonding, both of which were overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 7411f26..23ef21f 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -117,7 +117,7 @@ struct dpi_clk_calc_ctx { /* outputs */ struct dsi_clock_info dsi_cinfo; - unsigned long long fck; + unsigned long fck; struct dispc_clock_info dispc_cinfo; }; |
