patch-2.1.107 linux/arch/ppc/kernel/pmac_setup.c

Next file: linux/arch/ppc/kernel/prep_setup.c
Previous file: linux/arch/ppc/kernel/chrp_setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.106/linux/arch/ppc/kernel/pmac_setup.c linux/arch/ppc/kernel/pmac_setup.c
@@ -38,9 +38,8 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/major.h>
-#ifdef CONFIG_ABSTRACT_CONSOLE
+#include <linux/vt_kern.h>
 #include <linux/console.h>
-#endif
 #include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -142,6 +141,12 @@
 	/* Frame buffer device based console */
 	conswitchp = &fb_con;
 #endif
+#ifdef CONFIG_ABSCON_COMPAT
+	/* Console wrapper */
+	conswitchp = &compat_con;
+#endif
+
+	kd_mksound = pmac_mksound;
 }
 
 static volatile u32 *feature_addr;

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