diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a8f4cdfbda0..4ff0ee960e77 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* emit-rtl.c (classify_insn): Make it static.
+	* rtl.h: Remove the corresponding prototype.
+
 2004-11-19  Ben Elliston  <bje@au.ibm.com>
 
 	* dwarf2asm.h (dw2_asm_output_pcel): Stub out with #if 0.
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 4a0ead7b34ee..051dd152d15a 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4708,7 +4708,7 @@ set_unique_reg_note (rtx insn, enum reg_note kind, rtx datum)
 /* Return an indication of which type of insn should have X as a body.
    The value is CODE_LABEL, INSN, CALL_INSN or JUMP_INSN.  */
 
-enum rtx_code
+static enum rtx_code
 classify_insn (rtx x)
 {
   if (LABEL_P (x))
diff --git a/gcc/rtl.h b/gcc/rtl.h
index ed9fc875b0a8..ff4a0650d586 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1954,7 +1954,6 @@ extern void add_insn_before (rtx, rtx);
 extern void add_insn_after (rtx, rtx);
 extern void remove_insn (rtx);
 extern void emit_insn_after_with_line_notes (rtx, rtx, rtx);
-extern enum rtx_code classify_insn (rtx);
 extern rtx emit (rtx);
 extern void renumber_insns (FILE *);
 extern void remove_unnecessary_notes (void);