diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 11:14:30 +0200 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 11:14:30 +0200 |
| commit | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 (patch) | |
| tree | f7d0d548004751aea77f63e6fd695faf0785bde0 /drivers/video/backlight/adp8860_bl.c | |
| parent | video: s3c-fb: Add support EXYNOS4 FIMD (diff) | |
| parent | Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-d4a7dbfdf180a656de3eb9e64614e2b991ffaa53.tar.xz linux-d4a7dbfdf180a656de3eb9e64614e2b991ffaa53.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next
Conflicts:
drivers/video/atmel_lcdfb.c
Diffstat (limited to 'drivers/video/backlight/adp8860_bl.c')
| -rw-r--r-- | drivers/video/backlight/adp8860_bl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c index 183b6f639852..66bc74d9ce2a 100644 --- a/drivers/video/backlight/adp8860_bl.c +++ b/drivers/video/backlight/adp8860_bl.c @@ -7,7 +7,6 @@ */ #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/errno.h> #include <linux/pm.h> |