patch-2.1.43 linux/fs/proc/array.c

Next file: linux/fs/proc/base.c
Previous file: linux/fs/proc/arbitrary.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.42/linux/fs/proc/array.c linux/fs/proc/array.c
@@ -154,8 +154,6 @@
 	return read;
 }
 
-
-
 /*
  * Writing to /proc/profile resets the counters
  *
@@ -1021,6 +1019,9 @@
 #ifdef CONFIG_ZORRO
 extern int zorro_get_list(char *);
 #endif
+#if defined (CONFIG_AMIGA) || defined (CONFIG_ATARI)
+extern int get_hardware_list(char *);
+#endif
 
 static long get_root_array(char * page, int type, char **start,
 	off_t offset, unsigned long length)
@@ -1105,6 +1106,10 @@
 		case PROC_ZORRO:
 			return zorro_get_list(page);
 #endif
+#if defined (CONFIG_AMIGA) || defined (CONFIG_ATARI)
+		case PROC_HARDWARE:
+			return get_hardware_list(page);
+#endif
 	}
 	return -EBADF;
 }
@@ -1211,7 +1216,6 @@
 	NULL,			/* mknod */
 	NULL,			/* rename */
 	NULL,			/* readlink */
-	NULL,			/* follow_link */
 	NULL,			/* readpage */
 	NULL,			/* writepage */
 	NULL,			/* bmap */
@@ -1257,7 +1261,6 @@
 	NULL,			/* mknod */
 	NULL,			/* rename */
 	NULL,			/* readlink */
-	NULL,			/* follow_link */
 	NULL,			/* readpage */
 	NULL,			/* writepage */
 	NULL,			/* bmap */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov