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/Makefile | |
parent | c54554d388369f7f88ddcbe285ca96f7fb8a2d4b (diff) | |
parent | f6ec2d96796d0accda6c325890206f3629130729 (diff) | |
download | op-kernel-dev-ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc.zip op-kernel-dev-ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc.tar.gz |
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 d8a08e4..b405aac 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@ -15,3 +15,5 @@ obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o obj-$(CONFIG_BACKLIGHT_PWM) += pwm_bl.o +obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o + |