diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:32 -0400 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /drivers/video/backlight/Makefile | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/video/backlight/Makefile')
| -rw-r--r-- | drivers/video/backlight/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile index 36855ae887d6..a2ac9cfbaf6b 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile | |||
| @@ -21,6 +21,7 @@ obj-$(CONFIG_BACKLIGHT_EP93XX) += ep93xx_bl.o | |||
| 21 | obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o | 21 | obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o |
| 22 | obj-$(CONFIG_BACKLIGHT_HP700) += jornada720_bl.o | 22 | obj-$(CONFIG_BACKLIGHT_HP700) += jornada720_bl.o |
| 23 | obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o | 23 | obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o |
| 24 | obj-$(CONFIG_BACKLIGHT_LM3533) += lm3533_bl.o | ||
| 24 | obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o | 25 | obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o |
| 25 | obj-$(CONFIG_BACKLIGHT_LP855X) += lp855x_bl.o | 26 | obj-$(CONFIG_BACKLIGHT_LP855X) += lp855x_bl.o |
| 26 | obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o | 27 | obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o |