diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/video/console/bitblit.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/video/console/bitblit.c')
| -rw-r--r-- | drivers/video/console/bitblit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c index af88651b0735..28b1a834906b 100644 --- a/drivers/video/console/bitblit.c +++ b/drivers/video/console/bitblit.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | /* | 22 | /* |
| 23 | * Accelerated handlers. | 23 | * Accelerated handlers. |
| 24 | */ | 24 | */ |
| 25 | static inline void update_attr(u8 *dst, u8 *src, int attribute, | 25 | static void update_attr(u8 *dst, u8 *src, int attribute, |
| 26 | struct vc_data *vc) | 26 | struct vc_data *vc) |
| 27 | { | 27 | { |
| 28 | int i, offset = (vc->vc_font.height < 10) ? 1 : 2; | 28 | int i, offset = (vc->vc_font.height < 10) ? 1 : 2; |