diff options
| author | Linus Torvalds | 2016-05-20 20:01:02 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-20 20:01:02 +0200 |
| commit | 410b42978a241dc4a269d0d75c75d260e6d016e8 (patch) | |
| tree | 82f7e4b3ccddda806b36c84a19a46a221c4c219e /drivers/video/fbdev/amba-clcd.c | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| parent | fbdev: Use IS_ENABLED() instead of checking for built-in or module (diff) | |
| download | kernel-qcow2-linux-410b42978a241dc4a269d0d75c75d260e6d016e8.tar.gz kernel-qcow2-linux-410b42978a241dc4a269d0d75c75d260e6d016e8.tar.xz kernel-qcow2-linux-410b42978a241dc4a269d0d75c75d260e6d016e8.zip | |
Merge tag 'fbdev-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen:
- imxfb: fix lcd power up
- small fixes and cleanups
* tag 'fbdev-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
fbdev: Use IS_ENABLED() instead of checking for built-in or module
efifb: Don't show the mapping VA
video: AMBA CLCD: Remove unncessary include in amba-clcd.c
fbdev: ssd1307fb: Fix charge pump setting
Documentation: fb: fix spelling mistakes
fbdev: fbmem: implement error handling in fbmem_init()
fbdev: sh_mipi_dsi: remove driver
video: fbdev: imxfb: add some error handling
video: fbdev: imxfb: fix semantic of .get_power and .set_power
video: fbdev: omap2: Remove deprecated regulator_can_change_voltage() usage
Diffstat (limited to 'drivers/video/fbdev/amba-clcd.c')
| -rw-r--r-- | drivers/video/fbdev/amba-clcd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 93e66a9148b9..9b158869cb89 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c @@ -34,8 +34,6 @@ #include <video/of_display_timing.h> #include <video/videomode.h> -#include <asm/sizes.h> - #define to_clcd(info) container_of(info, struct clcd_fb, fb) /* This is limited to 16 characters when displayed by X startup */ |