patch-2.1.129 linux/init/main.c

• Lines: 42
• Date: Mon Nov 16 10:32:58 1998
• Orig file: v2.1.128/linux/init/main.c
• Orig date: Thu Nov 12 16:21:24 1998

diff -u --recursive --new-file v2.1.128/linux/init/main.c linux/init/main.c
@@ -324,6 +324,9 @@
 #ifdef CONFIG_MDA_CONSOLE
 extern void mdacon_setup(char *str, int *ints);
 #endif
+#ifdef CONFIG_LTPC
+extern void ltpc_setup(char *str, int *ints);
+#endif
 
 #if defined(CONFIG_SYSVIPC)
 extern void ipc_init(void);
@@ -370,7 +373,7 @@
 	char *cur = str;
 	int i=1;
 
-	while (cur && isdigit(*cur) && i <= 10) {
+	while (cur && (*cur=='-' || isdigit(*cur)) && i <= 10) {
 		ints[i++] = simple_strtol(cur,NULL,0);
 		if ((cur = strchr(cur,',')) != NULL)
 			cur++;
@@ -835,9 +838,12 @@
 #ifdef CONFIG_MD_BOOT
 	{ "md=", md_setup},
 #endif
-#ifdef CONFIG_MACMOUSE
+#ifdef CONFIG_ADBMOUSE
 	{ "adb_buttons=", adb_mouse_setup },
 #endif
+#ifdef CONFIG_LTPC
+	{ "ltpc=", ltpc_setup },
+#endif
 	{ 0, 0 }
 };
 
@@ -1240,7 +1246,7 @@
 #ifdef CONFIG_SBUS
 	sbus_init();
 #endif
-#if defined(CONFIG_PMAC) || defined(CONFIG_CHRP)
+#if defined(CONFIG_PPC)
 	powermac_init();
 #endif
 #ifdef CONFIG_MCA