diff --git a/[refs] b/[refs] index 6271711a5250..f05fe8a01eaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 +refs/heads/master: 22f4a00fd5207a107fb81984f7b4cc09e5047b45 diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 372aa1776827..9bb6763d0cb8 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -34,7 +34,6 @@ #endif #include #include -#include #include #include @@ -162,7 +161,6 @@ char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size } #ifdef CONFIG_LOGO -#include static inline unsigned safe_shift(unsigned d, int n) { diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c index 53beeb4a9998..fbbcb7156a34 100644 --- a/trunk/drivers/video/fbmon.c +++ b/trunk/drivers/video/fbmon.c @@ -29,9 +29,9 @@ #include #include #include +#include #include