patch for lilo-21.7.5

[Peter Kundrat]

Hello,

This stuff is simple forward port of the patch
in CVS (lilo21-mtd-patch). It seems that since version 21.6 
LARGDE_EBDA doesnt need to be defined.
I'll try to push that patch upstream.

	Regards,

		pkx
-- 
Peter Kundrat
peter at kundrat.sk
-------------- next part --------------
diff -x *~ -x *.rej -x *.orig -x *.s -x *.o -x *.lis -ur lilo-21.7.5/geometry.c lilo-21.7.5-mtd/geometry.c
--- lilo-21.7.5/geometry.c	Tue Apr 17 22:38:21 2001
+++ lilo-21.7.5-mtd/geometry.c	Fri May 18 14:42:09 2001
@@ -129,6 +129,7 @@
       MAJOR(dev) == MAJOR_SD2 || MAJOR(dev) == MAJOR_SD3 ||
       MAJOR(dev) == MAJOR_SD4 || MAJOR(dev) == MAJOR_ESDI ||
       MAJOR(dev) == MAJOR_AMI_HYP ||
+      MAJOR(dev) == MAJOR_FL || MAJOR(dev) == MAJOR_NFTL ||
       (MAJOR(dev) >= MAJOR_IDE7 && MAJOR(dev) <= MAJOR_IDE10) ||
       (MAJOR(dev) >= MAJOR_I2O && MAJOR(dev) <= MAJOR_I2O+7) ||
       (MAJOR(dev) >= COMPAQ_SMART2_MAJOR && MAJOR(dev) <= COMPAQ_SMART2_MAJOR+7) ||
@@ -327,6 +328,9 @@
 	    /* fall through */
 	case MAJOR_ESDI:
 	    /* fall through */
+	case MAJOR_FL:
+        case MAJOR_NFTL:
+	    /* fall through */
 	case MAJOR_XT:
 	    /* fall through */
 	case MAJOR_I2O:
@@ -337,7 +341,10 @@
 	case MAJOR_I2O+5:
 	case MAJOR_I2O+6:
 	case MAJOR_I2O+7:
-	    geo->device = 0x80+(MINOR(device) >> 6)+(MAJOR(device) == MAJOR_HD ?
+	    geo->device = 0x80+(MINOR(device) >> 6)+(
+	      (MAJOR(device) == MAJOR_HD ||
+               MAJOR(device) == MAJOR_FL ||
+               MAJOR(device) == MAJOR_NFTL) ?
 	      0 : last_dev(MAJOR_HD,64));
 	    if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0)
 		die("geo_query_dev HDIO_GETGEO (dev 0x%04x): %s",device,
Binary files lilo-21.7.5/lilo and lilo-21.7.5-mtd/lilo differ
diff -x *~ -x *.rej -x *.orig -x *.s -x *.o -x *.lis -ur lilo-21.7.5/lilo.h lilo-21.7.5-mtd/lilo.h
--- lilo-21.7.5/lilo.h	Tue Mar 20 22:30:29 2001
+++ lilo-21.7.5-mtd/lilo.h	Fri May 18 14:43:40 2001
@@ -48,6 +48,8 @@
 #define MAJOR_IDE8	89 /* IDE on eighth interface */
 #define MAJOR_IDE9	90 /* IDE on ninth interface */
 #define MAJOR_IDE10	91 /* IDE on tenth interface */
+#define MAJOR_FL        62 /* M-Systems Disk On Chip 2000 */
+#define MAJOR_NFTL      93 /* M-Systems DOC2000 NFTL driver */
 #define MAJOR_I2O	80  /* First I2O block device 80-87 */
 #define COMPAQ_SMART2_MAJOR	72 /* First Smart/2 Major 72-79 */
 #define COMPAQ_CISS_MAJOR	104 /* First CCISS Major 104-111 */