Commit d874b3a7 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen

drm: omapdrm: Remove dss_features.h

The header file only contains four macros, two of which are never used.
Move the other two to dss.h and remove dss_features.h.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 51919572
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
static struct { static struct {
struct platform_device *pdev; struct platform_device *pdev;
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
#include "dispc.h" #include "dispc.h"
/* DISPC */ /* DISPC */
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
struct dpi_data { struct dpi_data {
struct platform_device *pdev; struct platform_device *pdev;
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
#define DSI_CATCH_MISSING_TE #define DSI_CATCH_MISSING_TE
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
#define DSS_SZ_REGS SZ_512 #define DSS_SZ_REGS SZ_512
......
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
#include "omapdss.h" #include "omapdss.h"
#define MAX_DSS_LCD_MANAGERS 3
#define MAX_NUM_DSI 2
#ifdef pr_fmt #ifdef pr_fmt
#undef pr_fmt #undef pr_fmt
#endif #endif
......
/*
* linux/drivers/video/omap2/dss/dss_features.h
*
* Copyright (C) 2010 Texas Instruments
* Author: Archit Taneja <archit@ti.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __OMAP2_DSS_FEATURES_H
#define __OMAP2_DSS_FEATURES_H
#define MAX_DSS_MANAGERS 4
#define MAX_DSS_OVERLAYS 4
#define MAX_DSS_LCD_MANAGERS 3
#define MAX_NUM_DSI 2
#endif
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "hdmi4_core.h" #include "hdmi4_core.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
#include "hdmi.h" #include "hdmi.h"
static struct omap_hdmi hdmi; static struct omap_hdmi hdmi;
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <sound/asoundef.h> #include <sound/asoundef.h>
#include "hdmi4_core.h" #include "hdmi4_core.h"
#include "dss_features.h"
#define HDMI_CORE_AV 0x500 #define HDMI_CORE_AV 0x500
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "hdmi5_core.h" #include "hdmi5_core.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
static struct omap_hdmi hdmi; static struct omap_hdmi hdmi;
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
/* Venc registers */ /* Venc registers */
#define VENC_REV_ID 0x00 #define VENC_REV_ID 0x00
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
#include "dss_features.h"
struct dss_video_pll { struct dss_video_pll {
struct dss_pll pll; struct dss_pll pll;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment