Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 260008
b: refs/heads/master
c: e913972
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 8, 2011
1 parent a668533 commit 10f4449
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0cf0db5e3d32b3b1bb7c792f09f945ac929c659e
refs/heads/master: e913972423fc6ec0eee33469f691f9cce3a47680
4 changes: 2 additions & 2 deletions trunk/drivers/staging/gma500/mrst_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ int mrst_backlight_init(struct drm_device *dev)

mrst_backlight_device = backlight_device_register("mrst-bl",
NULL, (void *)dev, &mrst_ops, &props);

if (IS_ERR(mrst_backlight_device))
return PTR_ERR(mrst_backlight_device);

Expand Down Expand Up @@ -367,7 +367,7 @@ const struct psb_ops mrst_chip_ops = {
#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
.backlight_init = mrst_backlight_init,
#endif

.init_pm = mrst_init_pm,
.save_regs = mrst_save_display_registers,
.restore_regs = mrst_restore_display_registers,
Expand Down

0 comments on commit 10f4449

Please sign in to comment.