diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 09:07:54 -0400 |
| commit | a403e45c3b678211ee3b7225dbb924921fb5ddd3 (patch) | |
| tree | 6526d8d3c46f2443c7836bf094366179a57e7aad /drivers/video/sticore.h | |
| parent | a05d2ebab28011c2f3f520833f4bfdd2fd1b9c02 (diff) | |
| parent | d974ae379a2fbe8948f01eabbc6b19c0a80f09bc (diff) | |
Merge core/lib: pick up memparse() change.
Merge branch 'core/lib' into x86/xen
Diffstat (limited to 'drivers/video/sticore.h')
| -rw-r--r-- | drivers/video/sticore.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/sticore.h b/drivers/video/sticore.h index 1a9a60c74be3..7fe5be4bc70e 100644 --- a/drivers/video/sticore.h +++ b/drivers/video/sticore.h | |||
| @@ -352,8 +352,6 @@ struct sti_struct *sti_get_rom(unsigned int index); /* 0: default sti */ | |||
| 352 | 352 | ||
| 353 | /* functions to call the STI ROM directly */ | 353 | /* functions to call the STI ROM directly */ |
| 354 | 354 | ||
| 355 | int sti_init_graph(struct sti_struct *sti); | ||
| 356 | void sti_inq_conf(struct sti_struct *sti); | ||
| 357 | void sti_putc(struct sti_struct *sti, int c, int y, int x); | 355 | void sti_putc(struct sti_struct *sti, int c, int y, int x); |
| 358 | void sti_set(struct sti_struct *sti, int src_y, int src_x, | 356 | void sti_set(struct sti_struct *sti, int src_y, int src_x, |
| 359 | int height, int width, u8 color); | 357 | int height, int width, u8 color); |