diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-30 15:53:49 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-10-30 15:53:49 +0300 |
| commit | a942535d6e5c23f0015d6674d28c91dd59a720e4 (patch) | |
| tree | f7ae17dffe1cc20e2255407b3c56c72ae6a9c203 /drivers/video/fbdev/omap2/dss/dispc.h | |
| parent | d0124f01ed3dd11338a9fb4ed980af9d3dd6d6bf (diff) | |
| parent | 4ee9d9d2c294c175b78f8350bf6231d448597a65 (diff) | |
| download | linux-a942535d6e5c23f0015d6674d28c91dd59a720e4.tar.xz | |
Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
Diffstat (limited to 'drivers/video/fbdev/omap2/dss/dispc.h')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dispc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.h b/drivers/video/fbdev/omap2/dss/dispc.h index 78edb449c763..3043d6e0a5f9 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.h +++ b/drivers/video/fbdev/omap2/dss/dispc.h @@ -101,8 +101,7 @@ DISPC_FIR_COEF_V2_OFFSET(n, i)) #define DISPC_OVL_PRELOAD(n) (DISPC_OVL_BASE(n) + \ DISPC_PRELOAD_OFFSET(n)) -#define DISPC_OVL_MFLAG_THRESHOLD(n) (DISPC_OVL_BASE(n) + \ - DISPC_MFLAG_THRESHOLD_OFFSET(n)) +#define DISPC_OVL_MFLAG_THRESHOLD(n) DISPC_MFLAG_THRESHOLD_OFFSET(n) /* DISPC up/downsampling FIR filter coefficient structure */ struct dispc_coef { |