|
@@ -31,11 +31,14 @@
|
|
#include <mach/dma.h>
|
|
#include <mach/dma.h>
|
|
#include <mach/omapfb.h>
|
|
#include <mach/omapfb.h>
|
|
|
|
|
|
|
|
+#include "lcdc.h"
|
|
|
|
+#include "dispc.h"
|
|
|
|
+
|
|
#define MODULE_NAME "omapfb"
|
|
#define MODULE_NAME "omapfb"
|
|
|
|
|
|
static unsigned int def_accel;
|
|
static unsigned int def_accel;
|
|
static unsigned long def_vram[OMAPFB_PLANE_NUM];
|
|
static unsigned long def_vram[OMAPFB_PLANE_NUM];
|
|
-static int def_vram_cnt;
|
|
|
|
|
|
+static unsigned int def_vram_cnt;
|
|
static unsigned long def_vxres;
|
|
static unsigned long def_vxres;
|
|
static unsigned long def_vyres;
|
|
static unsigned long def_vyres;
|
|
static unsigned int def_rotate;
|
|
static unsigned int def_rotate;
|
|
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {
|
|
* LCD panel
|
|
* LCD panel
|
|
* ---------------------------------------------------------------------------
|
|
* ---------------------------------------------------------------------------
|
|
*/
|
|
*/
|
|
-extern struct lcd_ctrl omap1_int_ctrl;
|
|
|
|
-extern struct lcd_ctrl omap2_int_ctrl;
|
|
|
|
extern struct lcd_ctrl hwa742_ctrl;
|
|
extern struct lcd_ctrl hwa742_ctrl;
|
|
extern struct lcd_ctrl blizzard_ctrl;
|
|
extern struct lcd_ctrl blizzard_ctrl;
|
|
|
|
|
|
-static struct lcd_ctrl *ctrls[] = {
|
|
|
|
|
|
+static const struct lcd_ctrl *ctrls[] = {
|
|
#ifdef CONFIG_ARCH_OMAP1
|
|
#ifdef CONFIG_ARCH_OMAP1
|
|
&omap1_int_ctrl,
|
|
&omap1_int_ctrl,
|
|
#else
|
|
#else
|