diff options
| author | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-05-11 18:03:54 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:06 -0600 |
| commit | 441d00e2e834d28bf9f20540177dd89b7a3853df (patch) | |
| tree | bfceb3f4127ab57c31f3e10c34d1397706fc9ab3 /drivers | |
| parent | 6fab7706383b909ac94089a71416569fd61ae0d0 (diff) | |
video: mcde: add merge changes to mcde.c
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/video/mcde/mcde.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/video/mcde/mcde.c b/drivers/video/mcde/mcde.c index 935b3f4e755..99d815f6b6b 100755 --- a/drivers/video/mcde/mcde.c +++ b/drivers/video/mcde/mcde.c @@ -44,6 +44,7 @@ extern "C" { #include <linux/gpio.h> #include <linux/init.h> #include <linux/regulator/consumer.h> +#include <linux/debugfs.h> #include <asm/dma.h> #include <asm/uaccess.h> #include <mach/mcde_common.h> @@ -4640,7 +4641,6 @@ static int __init mcde_probe(struct platform_device *pdev) u8 * dsiChanlRegAdd = NULL; u8 *dsilinkAddr = NULL; u32 rotationframesize = 0; - int data_4500; int i, ret; #ifdef CONFIG_FB_U8500_MCDE_CHANNELB_DISPLAY_VUIB_WVGA volatile u32 __iomem *clcd_clk; @@ -4678,8 +4678,7 @@ static int __init mcde_probe(struct platform_device *pdev) PRNK_COL(PRNK_COL_GREEN); printk(KERN_INFO "MCDE probe: channel id = %d\n", - channel_info->channelid); - + channel_info->channelid); /** To be removed I2C */ if(!i2c_init_done) { @@ -5594,7 +5593,6 @@ extern "C" { #include <linux/delay.h> #include <linux/gpio.h> #include <linux/init.h> -#include <linux/debugfs.h> #include <asm/dma.h> #include <asm/uaccess.h> @@ -5648,9 +5646,6 @@ void mcde_fb_unlock(struct fb_info *info, const char *caller) int mcde_debug = MCDE_DEFAULT_LOG_LEVEL; -/* ecsmmtu: I dont't think the variable below is used for anything. - * TODO: chk if static and remove. - */ char isVideoModeChanged = 0; unsigned int mcde_4500_plugstatus=0; @@ -8571,6 +8566,7 @@ static int __init mcde_probe(struct platform_device *pdev) u8 * dsiChanlRegAdd = NULL; u8 *dsilinkAddr = NULL; u32 rotationframesize = 0; + int data_4500; #ifdef CONFIG_FB_U8500_MCDE_CHANNELB_DISPLAY_VUIB_WVGA volatile u32 __iomem *clcd_clk; |