Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / video / sticore.h

diff --git a/drivers/video/sticore.h b/drivers/video/sticore.h
index 1a9a60c..addf7b6 100644 (file)
--- a/drivers/video/sticore.h
+++ b/drivers/video/sticore.h
@@ -79,7 +79,7 @@ struct sti_glob_cfg_ext {
         u8 curr_mon;                   /* current monitor configured */
         u8 friendly_boot;              /* in friendly boot mode */
        s16 power;                      /* power calculation (in Watts) */
-       s32 freq_ref;                   /* frequency refrence */
+       s32 freq_ref;                   /* frequency reference */
        u32 sti_mem_addr;               /* pointer to global sti memory (size=sti_mem_request) */
        u32 future_ptr;                 /* pointer to future data */
 };
@@ -352,8 +352,6 @@ struct sti_struct *sti_get_rom(unsigned int index); /* 0: default sti */
 
 /* functions to call the STI ROM directly */
 
-int  sti_init_graph(struct sti_struct *sti);
-void sti_inq_conf(struct sti_struct *sti);
 void sti_putc(struct sti_struct *sti, int c, int y, int x);
 void sti_set(struct sti_struct *sti, int src_y, int src_x,
             int height, int width, u8 color);