patch-2.1.17 linux/include/asm-m68k/zorro.h

• Lines: 48
• Date: Fri Dec 20 11:20:03 1996
• Orig file: v2.1.16/linux/include/asm-m68k/zorro.h
• Orig date: Fri Nov 22 18:28:21 1996

diff -u --recursive --new-file v2.1.16/linux/include/asm-m68k/zorro.h linux/include/asm-m68k/zorro.h
@@ -8,15 +8,11 @@
  * for more details.
  */
 
-#ifndef _ASM_M68K_ZORRO_H_
-#define _ASM_M68K_ZORRO_H_
+#ifndef _M68K_ZORRO_H
+#define _M68K_ZORRO_H
 
 #ifndef __ASSEMBLY__
 
-#include <linux/config.h>
-#include <asm/amigatypes.h>
-
-
 /*
  * Defined Board Manufacturers
  *
@@ -531,6 +527,14 @@
 
 #ifndef __ASSEMBLY__
 
+#define ZORRO_NUM_AUTO		16
+
+#ifdef __KERNEL__
+
+extern int zorro_num_autocon;		/* # of autoconfig devices found */
+extern struct ConfigDev zorro_autocon[ZORRO_NUM_AUTO];
+
+
 /*
  * Zorro Functions
  */
@@ -564,11 +568,10 @@
  * Verbose Board Identification
  */
 
-#ifdef CONFIG_ZORRO
 extern void zorro_identify(void);
 extern int zorro_get_list(char *buffer);
-#endif CONFIG_ZORRO
 
-#endif	/* __ASSEMBLY__ */
+#endif	/* !__ASSEMBLY__ */
+#endif	/* __KERNEL__ */
 
-#endif /* _ASM_M68K_ZORRO_H_ */
+#endif /* __ASMm68K_ZORRO_H */