[PATCH] Elan bugfixes

[Robert Schwebel]

Marcelo,

here are two quick bugfix chunks from the AMD Elan patch against
2.4.18-pre8. Please apply - thanks.

Robert

----------8<----------

diff -urN -X kernel-patches/dontdiff linux-2.4.18-pre7/arch/i386/config.in linux-2.4.18-pre7-elan/arch/i386/config.in
--- linux-2.4.18-pre7/arch/i386/config.in	Thu Jan 24 07:36:14 2002
+++ linux-2.4.18-pre7-elan/arch/i386/config.in	Tue Feb  5 01:07:31 2002
@@ -182,6 +182,10 @@
    define_bool CONFIG_X86_PAE y
 fi

+if [ "$CONFIG_MELAN" = "y" ]; then
+   define_bool CONFIG_MATH_EMULATION y
+fi
+
 bool 'Math emulation' CONFIG_MATH_EMULATION
 bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
 bool 'Symmetric multi-processing support' CONFIG_SMP
diff -urN -X kernel-patches/dontdiff linux-2.4.18-pre7/arch/i386/kernel/setup.c linux-2.4.18-pre7-elan/arch/i386/kernel/setup.c
--- linux-2.4.18-pre7/arch/i386/kernel/setup.c	Thu Jan 24 07:36:14 2002
+++ linux-2.4.18-pre7-elan/arch/i386/kernel/setup.c	Thu Jan 24 08:51:01 2002
@@ -329,7 +329,7 @@
 	{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
 	{ "fpu", 0xf0, 0xff, IORESOURCE_BUSY }
 };
-#ifdef CONFIG_ELAN
+#ifdef CONFIG_MELAN
 standard_io_resources[1] = { "pic1", 0x20, 0x21, IORESOURCE_BUSY };
 standard_io_resources[5] = { "pic2", 0xa0, 0xa1, IORESOURCE_BUSY };
 #endif

----------8<----------
--
 +--------------------------------------------------------+
 | Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de |
 | Pengutronix - Linux Solutions for Science and Industry |
 |   Braunschweiger Str. 79,  31134 Hildesheim, Germany   |
 |    Phone: [phone] |  Fax: [phone]    |
 +--------------------------------------------------------+