diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8bb03f70cc8cb51c07af2f18fd984d218aa197eb..3827a80b2b4d4364bc8d9c59c82e3c8f5c81de41 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18  Kazu Hirata  <kazu@codesourcery.com>
+
+	* mode-switching.c (optimize_mode_switching): Make it static.
+	* basic-block.h: Remove the prototype for
+	optimize_mode_switching.
+
 2006-01-18  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* config/alpha/alpha.c (alpha_split_tfmode_pair): Rename into
diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index aa136d378d70fd9600cd794b58356890f481ff66..ab2d927c308245c2d31448094de244f3aba64a64 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -872,7 +872,6 @@ extern struct edge_list *pre_edge_rev_lcm (FILE *, int, sbitmap *,
 					   sbitmap *, sbitmap **,
 					   sbitmap **);
 extern void compute_available (sbitmap *, sbitmap *, sbitmap *, sbitmap *);
-extern int optimize_mode_switching (FILE *);
 
 /* In predict.c */
 extern void estimate_probability (struct loops *);
diff --git a/gcc/mode-switching.c b/gcc/mode-switching.c
index 30ad3a833576c9753cf794f233a142fc1dcf3372..3e7ec7e39ba047dc98d5a9e2470781c6aa61de9f 100644
--- a/gcc/mode-switching.c
+++ b/gcc/mode-switching.c
@@ -382,7 +382,7 @@ create_pre_exit (int n_entities, int *entity_map, const int *num_modes)
 /* Find all insns that need a particular mode setting, and insert the
    necessary mode switches.  Return true if we did work.  */
 
-int
+static int
 optimize_mode_switching (FILE *file)
 {
   rtx insn;