git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
video
/
msm
/
mddi.c
diff --git
a/drivers/video/msm/mddi.c
b/drivers/video/msm/mddi.c
index
c1ff271
..
7c316c3
100644
(file)
--- a/
drivers/video/msm/mddi.c
+++ b/
drivers/video/msm/mddi.c
@@
-187,10
+187,8
@@
static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask);
static void mddi_handle_rev_data_avail(struct mddi_info *mddi)
{
static void mddi_handle_rev_data_avail(struct mddi_info *mddi)
{
- union mddi_rev *rev = mddi->rev_data;
uint32_t rev_data_count;
uint32_t rev_crc_err_count;
uint32_t rev_data_count;
uint32_t rev_crc_err_count;
- int i;
struct reg_read_info *ri;
size_t prev_offset;
uint16_t length;
struct reg_read_info *ri;
size_t prev_offset;
uint16_t length;
@@
-670,7
+668,7
@@
static int __init mddi_rev_data_setup(struct mddi_info *mddi)
return 0;
}
return 0;
}
-static int __init mddi_probe(struct platform_device *pdev)
+static int __
dev
init mddi_probe(struct platform_device *pdev)
{
struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
struct mddi_info *mddi = &mddi_info[pdev->id];
{
struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
struct mddi_info *mddi = &mddi_info[pdev->id];