Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330080
b: refs/heads/master
c: 52e8424
h: refs/heads/master
v: v3
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Oct 5, 2012
1 parent 3eb0cda commit 6fdb512
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66be0e5bf5f555742a14a14712b537470dd2ba7e
refs/heads/master: 52e842432f36d5b15227d0ee0d2aa3d2bc3cc0b2
10 changes: 10 additions & 0 deletions trunk/drivers/video/backlight/platform_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/fb.h>
#include <linux/backlight.h>
#include <linux/lcd.h>
#include <linux/of.h>
#include <linux/slab.h>

#include <video/platform_lcd.h>
Expand Down Expand Up @@ -145,13 +146,22 @@ static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
platform_lcd_resume);
#endif

#ifdef CONFIG_OF
static const struct of_device_id platform_lcd_of_match[] = {
{ .compatible = "platform-lcd" },
{},
};
MODULE_DEVICE_TABLE(of, platform_lcd_of_match);
#endif

static struct platform_driver platform_lcd_driver = {
.driver = {
.name = "platform-lcd",
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &platform_lcd_pm_ops,
#endif
.of_match_table = of_match_ptr(platform_lcd_of_match),
},
.probe = platform_lcd_probe,
.remove = __devexit_p(platform_lcd_remove),
Expand Down

0 comments on commit 6fdb512

Please sign in to comment.