diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-08 21:29:06 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-08 21:29:06 +0300 |
| commit | 66215949e6512f61c2c92b65ea79f8566e9e650a (patch) | |
| tree | 8efbddd63e7225731391cf7c67786a0e133b2c46 | |
| parent | c5c4dce45d7538ada6e9aac4cdb2909bc1cb28f6 (diff) | |
| download | linux-66215949e6512f61c2c92b65ea79f8566e9e650a.tar.xz | |
omap1: Fix compile for omap1_bl.c
Commit 9905a43b made struct backlight_ops const. Omap was
setting check_fb dynamically, which caused the following
compile error:
drivers/video/backlight/omap1_bl.c: In function 'omapbl_probe':
drivers/video/backlight/omap1_bl.c:142: error: assignment of read-only variable 'omapbl_ops'
Turns out pdata->check_fb is not being used, so just remove
it to fix the compile.
Cc: Emese Revfy <re.emese@gmail.com>
Cc: Richard Purdie <rpurdie@linux.intel.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/plat-omap/include/plat/board.h | 1 | ||||
| -rw-r--r-- | drivers/video/backlight/omap1_bl.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h index 376ce18216ff..5cd622039da0 100644 --- a/arch/arm/plat-omap/include/plat/board.h +++ b/arch/arm/plat-omap/include/plat/board.h @@ -99,7 +99,6 @@ struct fb_info; struct omap_backlight_config { int default_intensity; int (*set_power)(struct device *dev, int state); - int (*check_fb)(struct fb_info *fb); }; struct omap_fbmem_config { diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c index 409ca9643528..a3a7f8938175 100644 --- a/drivers/video/backlight/omap1_bl.c +++ b/drivers/video/backlight/omap1_bl.c @@ -139,8 +139,6 @@ static int omapbl_probe(struct platform_device *pdev) if (!pdata) return -ENXIO; - omapbl_ops.check_fb = pdata->check_fb; - bl = kzalloc(sizeof(struct omap_backlight), GFP_KERNEL); if (unlikely(!bl)) return -ENOMEM; |