diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
| commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
| tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /drivers/video/console/sticon.c | |
| parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
| parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) | |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'drivers/video/console/sticon.c')
| -rw-r--r-- | drivers/video/console/sticon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c index 5f65ca3d8564..026fd1215933 100644 --- a/drivers/video/console/sticon.c +++ b/drivers/video/console/sticon.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| 48 | 48 | ||
| 49 | #include "../sticore.h" | 49 | #include "../fbdev/sticore.h" |
| 50 | 50 | ||
| 51 | /* switching to graphics mode */ | 51 | /* switching to graphics mode */ |
| 52 | #define BLANK 0 | 52 | #define BLANK 0 |