diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:16:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:16:40 -0400 |
| commit | ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc (patch) | |
| tree | 5739a96e5e71e9863e332085e4368d0b99501bdb /drivers/video/backlight/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/video/backlight/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile index d8a08e468cc7..b405aace803f 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile | |||
| @@ -15,3 +15,5 @@ obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o | |||
| 15 | obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o | 15 | obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o |
| 16 | obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o | 16 | obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o |
| 17 | obj-$(CONFIG_BACKLIGHT_PWM) += pwm_bl.o | 17 | obj-$(CONFIG_BACKLIGHT_PWM) += pwm_bl.o |
| 18 | obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o | ||
| 19 | |||