Update of /cvsroot/linux-vax/kernel-2.4/drivers/sbus
In directory usw-pr-cvs1:/tmp/cvs-serv8509/sbus
Modified Files:
Makefile sbus.c
Log Message:
synch 2.4.15 commit 52
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/sbus/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 18:44:36 -0000 1.1.1.1
+++ Makefile 11 Apr 2002 12:55:56 -0000 1.2
@@ -18,6 +18,10 @@
subdir-y += audio
subdir-m += audio
-obj-$(CONFIG_SPARCAUDIO) += audio/sparcaudio.o
+
+# This is grotty but works around some problems with modules.
+ifeq ($(CONFIG_SPARCAUDIO),y)
+obj-y += audio/sparcaudio.o
+endif
include $(TOPDIR)/Rules.make
Index: sbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/sbus/sbus.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- sbus.c 25 Feb 2001 23:15:10 -0000 1.1.1.2
+++ sbus.c 11 Apr 2002 12:55:56 -0000 1.2
@@ -280,6 +280,8 @@
}
extern void register_proc_sparc_ioport(void);
+extern void firetruck_init(void);
+extern void rs_init(void);
void __init sbus_init(void)
{
@@ -310,7 +312,6 @@
prom_halt();
} else {
#ifdef __sparc_v9__
- extern void firetruck_init(void);
firetruck_init();
#endif
}
@@ -488,10 +489,10 @@
sun4d_init_sbi_irq();
}
+ rs_init();
+
#ifdef __sparc_v9__
if (sparc_cpu_model == sun4u) {
- extern void firetruck_init(void);
-
firetruck_init();
}
#endif
|
