Merge Christoph's freeze cleanup patch

[linux-2.6] / arch / um / include / line.h

diff --git a/arch/um/include/line.h b/arch/um/include/line.h
index 4c5e92c04ccba6c6471befbc835293155322d308..5323d22a6ca701c97e6fcfc163ce8102890c0901 100644 (file)
--- a/arch/um/include/line.h
+++ b/arch/um/include/line.h
@@ -101,7 +101,8 @@ extern void lines_init(struct line *lines, int nlines);
 extern void close_lines(struct line *lines, int nlines);
 
 extern int line_config(struct line *lines, unsigned int sizeof_lines, char *str);
-extern int line_remove(struct line *lines, unsigned int sizeof_lines, char *str);
+extern int line_id(char **str, int *start_out, int *end_out);
+extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n);
 extern int line_get_config(char *dev, struct line *lines, unsigned int sizeof_lines, char *str,
                           int size, char **error_out);