diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /include/multiboot.h | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'include/multiboot.h')
| -rw-r--r-- | include/multiboot.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/multiboot.h b/include/multiboot.h index 950c853d0..d4700ff4e 100644 --- a/include/multiboot.h +++ b/include/multiboot.h @@ -15,7 +15,7 @@ void MultiBootInit(struct MultiBootParam *mp); int MultiBootMain(struct MultiBootParam *mp); void MultiBootStartProbe(struct MultiBootParam *mp); -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 MultiBootCheckComplete(struct MultiBootParam *mp); #endif // GUARD_MULTIBOOT_H |