diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:16:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:16:40 -0700 |
| commit | ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc (patch) | |
| tree | 5739a96e5e71e9863e332085e4368d0b99501bdb /drivers/video/backlight/backlight.c | |
| parent | c54554d388369f7f88ddcbe285ca96f7fb8a2d4b (diff) | |
| parent | f6ec2d96796d0accda6c325890206f3629130729 (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
backlight: Fix missing kernel doc entry
backlight: Add Nvidia-based Apple Macbook Pro backlight driver
Diffstat (limited to 'drivers/video/backlight/backlight.c')
| -rw-r--r-- | drivers/video/backlight/backlight.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index 39394757679c..fab0bc874b58 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -191,6 +191,7 @@ static struct device_attribute bl_device_attributes[] = { * backlight_device class. * @name: the name of the new object(must be the same as the name of the * respective framebuffer device). + * @parent: a pointer to the parent device * @devdata: an optional pointer to be stored for private driver use. The * methods may retrieve it by using bl_get_data(bd). * @ops: the backlight operations structure. |