diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-25 10:04:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-25 10:04:22 +0200 |
| commit | 42ebd27bcbda7895fa07c61185a26d8379945ed0 (patch) | |
| tree | 51be64b0c2c0defd1a0ce3e6d55452dbd8a7aaae /drivers/video/console/sticon.c | |
| parent | a81fef347b32dea2b31275826afe1c93fa0d2d54 (diff) | |
| parent | 9f7ff8931e3c5ddc8535476971ec9501e9555c05 (diff) | |
| download | blackbird-op-linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.tar.gz blackbird-op-linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 @@ #include <asm/io.h> -#include "../sticore.h" +#include "../fbdev/sticore.h" /* switching to graphics mode */ #define BLANK 0 |
