diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/video/backlight/omap1_bl.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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; |