diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
| commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
| tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /src/multiboot.c | |
| parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge with master and fix conflicts
Diffstat (limited to 'src/multiboot.c')
| -rw-r--r-- | src/multiboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multiboot.c b/src/multiboot.c index 80291ff46..7fd6df2d0 100644 --- a/src/multiboot.c +++ b/src/multiboot.c @@ -316,7 +316,7 @@ void MultiBootStartProbe(struct MultiBootParam *mp) mp->probe_count = 1; } -void MultiBootStartMaster(struct MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed) +void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, int length, u8 palette_color, s8 palette_speed) { int i = 0; |