X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flib%2Fkernel%2Flist.h;h=a041299f6701f02e9d840dc52dab9ab4077702d9;hb=09bbcd059d4ce05bf6b8da829795409e2da9a899;hp=e71c1cab31500c801547ec39131ee668fdd8c288;hpb=d5aab5fcc001efba94a378535746e71a2e9d92f2;p=pintos-anon

diff --git a/src/lib/kernel/list.h b/src/lib/kernel/list.h
index e71c1ca..a041299 100644
--- a/src/lib/kernel/list.h
+++ b/src/lib/kernel/list.h
@@ -153,8 +153,6 @@ typedef bool list_less_func (const struct list_elem *a,
                              void *aux);
 
 /* Operations on lists with ordered elements. */
-void list_merge (struct list *, struct list *,
-                 list_less_func *, void *aux);
 void list_sort (struct list *,
                 list_less_func *, void *aux);
 void list_insert_ordered (struct list *, struct list_elem *,