Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / video / console / fbcon_cw.c

diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c
index 126110f8454ff5b305a83e0af55de6a8176fd1d6..6a737827beb1ca247ec54cbc8dde9536b876ba0b 100644 (file)
--- a/drivers/video/console/fbcon_cw.c
+++ b/drivers/video/console/fbcon_cw.c
@@ -22,7 +22,7 @@
  * Rotation 90 degrees
  */
 
-static inline void cw_update_attr(u8 *dst, u8 *src, int attribute,
+static void cw_update_attr(u8 *dst, u8 *src, int attribute,
                                  struct vc_data *vc)
 {
        int i, j, offset = (vc->vc_font.height < 10) ? 1 : 2;