Re: New version of AMD Elan patch

Robert Schwebel
2002-01-24T08:11:59Z

Hi Marcelo,

thanks for applying the Elan patch. Unfortunately, I've discovered a typo,
patch below.

For the list: the remaining stuff against -pre7 is as usual on

http://www.pengutronix.de/software/elan_en.wml

Changelog:

01/24/2002 Robert Schwebel <robert@schwebel.de>

- Revision 2.4.18-pre7.1 released.
- Marcelo has integrated everything but the serial
driver stuff into the latest pre-patch. I'll have
to send the rest to tytso...
- striped out the applied stuff
- typo in arch/i386/kernel/setup.c

Robert

----------8<----------
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: +49-5121-28619-0 | Fax: +49-5121-28619-4 |
+--------------------------------------------------------+