diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /drivers/video/backlight/omap1_bl.c | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'drivers/video/backlight/omap1_bl.c')
| -rw-r--r-- | drivers/video/backlight/omap1_bl.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) | |||
| 139 | if (!pdata) | 139 | if (!pdata) |
| 140 | return -ENXIO; | 140 | return -ENXIO; |
| 141 | 141 | ||
| 142 | omapbl_ops.check_fb = pdata->check_fb; | ||
| 143 | |||
| 144 | bl = kzalloc(sizeof(struct omap_backlight), GFP_KERNEL); | 142 | bl = kzalloc(sizeof(struct omap_backlight), GFP_KERNEL); |
| 145 | if (unlikely(!bl)) | 143 | if (unlikely(!bl)) |
| 146 | return -ENOMEM; | 144 | return -ENOMEM; |