Two of Dominik Kubla's patches failed to make it into 110p2, and there's
an apparent typo that needs fixing (patch against 110p2):
Steve
--- linux/arch/alpha/kernel/lca.c.orig Sat Jul 18 18:39:10 1998
+++ linux/arch/alpha/kernel/lca.c Sat Jul 18 19:57:17 1998
@@ -13,7 +13,7 @@
#include <asm/ptrace.h>
#include <asm/system.h>
#include <asm/io.h>
-##include <asm/smp.h>
+#include <asm/smp.h>
/*
* BIOS32-style PCI interface:
diff -urN linux-2.1.109/include/asm-alpha/io.h linux/include/asm-alpha/io.h
--- linux-2.1.109/include/asm-alpha/io.h Fri Jul 17 19:09:27 1998
+++ linux/include/asm-alpha/io.h Fri Jul 17 20:31:43 1998
@@ -99,20 +99,28 @@
*/
#if defined(CONFIG_ALPHA_LCA)
# include <asm/lca.h> /* get chip-specific definitions */
+# define DENSE_MEM(x) LCA_DENSE_MEM
#elif defined(CONFIG_ALPHA_APECS)
# include <asm/apecs.h> /* get chip-specific definitions */
+# define DENSE_MEM(x) APECS_DENSE_MEM
#elif defined(CONFIG_ALPHA_CIA)
# include <asm/cia.h> /* get chip-specific definitions */
+# define DENSE_MEM(x) CIA_DENSE_MEM
#elif defined(CONFIG_ALPHA_T2)
# include <asm/t2.h> /* get chip-specific definitions */
+# define DENSE_MEM(x) T2_DENSE_MEM
#elif defined(CONFIG_ALPHA_PYXIS)
# include <asm/pyxis.h> /* get chip-specific definitions */
+# define DENSE_MEM(x) PYXIS_DENSE_MEM
#elif defined(CONFIG_ALPHA_TSUNAMI)
# include <asm/tsunami.h> /* get chip-specific definitions */
+# warning DENSE_MEM undefined, TGA driver will not compile
#elif defined(CONFIG_ALPHA_MCPCIA)
# include <asm/mcpcia.h> /* get chip-specific definitions */
+# warning DENSE_MEM undefined, TGA driver will not compile
#else
# include <asm/jensen.h>
+# warning DENSE_MEM undefined, TGA driver will not compile
#endif
/*
--- linux/include/asm-alpha/io.h.orig Wed Jun 24 17:30:11 1998
+++ linux/include/asm-alpha/io.h Fri Jul 17 19:53:37 1998
@@ -228,6 +228,8 @@
#define memcpy_fromio(to,from,len) _memcpy_fromio((to),(unsigned long)(from),(len))
#define memcpy_toio(to,from,len) _memcpy_toio((unsigned long)(to),(from),(len))
#define memset_io(addr,c,len) _memset_io((unsigned long)(addr),(c),(len))
+#define memsetw_io(addr, c,len) _memsetw_io((u16 *)(addr),(u16)(c),(len))
+#define memsetw(addr, c, len) _memsetw((u16 *)(addr),(u16)(c),(len))
/*
* String versions of in/out ops:
diff -urN linux-2.1.109/init/main.c linux/init/main.c
--- linux-2.1.109/init/main.c Fri Jul 17 19:09:28 1998
+++ linux/init/main.c Fri Jul 17 20:52:40 1998
@@ -88,7 +88,9 @@
#ifdef __i386__
extern void ioapic_pirq_setup(char *str, int *ints);
#endif
+#ifdef CONFIG_VGA_CONSOLE
extern void no_scroll(char *str, int *ints);
+#endif
extern void kbd_reset_setup(char *str, int *ints);
extern void panic_setup(char *str, int *ints);
extern void bmouse_setup(char *str, int *ints);
@@ -536,7 +538,9 @@
{ "panic=", panic_setup },
{ "console=", console_setup },
#ifdef CONFIG_VT
+#ifdef CONFIG_VGA_CONSOLE
{ "no-scroll", no_scroll },
+#endif
{ "kbd-reset", kbd_reset_setup },
#endif
#ifdef CONFIG_BUGi386
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.altern.org/andrebalsa/doc/lkml-faq.html