Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv10630/arch/i386/kernel
Modified Files:
dmi_scan.c setup.c
Log Message:
Synced to 2.4.13
Index: dmi_scan.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/dmi_scan.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dmi_scan.c 2001/10/06 16:27:52 1.1
+++ dmi_scan.c 2001/10/29 00:10:58 1.2
@@ -9,6 +9,8 @@
#include <linux/pm.h>
#include <linux/keyboard.h>
+int is_sony_vaio_laptop;
+
struct dmi_header
{
u8 type;
@@ -321,8 +323,6 @@
* This one isn't a bug detect for those who asked, we simply want to
* activate Sony specific goodies like the camera and jogdial..
*/
-int is_sony_vaio_laptop;
-
static __init int sony_vaio_laptop(struct dmi_blacklist *d)
{
if (is_sony_vaio_laptop == 0)
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- setup.c 2001/10/15 01:13:17 1.28
+++ setup.c 2001/10/29 00:10:58 1.29
@@ -1592,7 +1592,7 @@
case 6:
switch (c->x86_model) {
- case 6 ... 7: /* Cyrix III or C3 */
+ case 6 ... 8: /* Cyrix III family */
rdmsr (MSR_VIA_FCR, lo, hi);
lo |= (1<<1 | 1<<7); /* Report CX8 & enable PGE */
wrmsr (MSR_VIA_FCR, lo, hi);
|
