--- fs/intermezzo/psdev.c.old	Tue Jan  1 18:16:39 2002
+++ fs/intermezzo/psdev.c	Tue Jan  1 22:17:59 2002
@@ -78,12 +78,12 @@
 {
         int minor;
 
-        if ( MAJOR(file->f_dentry->d_inode->i_rdev) != PRESTO_PSDEV_MAJOR ) {
+        if ( major(file->f_dentry->d_inode->i_rdev) != PRESTO_PSDEV_MAJOR ) {
                 EXIT;
                 return NULL;
         }
 
-        minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        minor = minor(file->f_dentry->d_inode->i_rdev);
         if ( minor < 0 || minor >= MAX_PRESTODEV ) {
                 EXIT;
                 return NULL;
@@ -290,7 +290,7 @@
                 }
 
                 len = readmount.io_len;
-                minor = MINOR(dev);
+                minor = minor(dev);
                 PRESTO_ALLOC(tmp, char *, len);
                 if (!tmp) {
                         EXIT;
@@ -627,7 +627,7 @@
                         EXIT;
                         return error;
                 }
-                minor = MINOR(dev);
+                minor = minor(dev);
                 if (cmd == PRESTO_SETOPT)
                         error = dosetopt(minor, &kopt);
 
@@ -788,7 +788,7 @@
                 }
 
                 error = lento_mknod(input.name, input.mode,
-                                    MKDEV(input.major,input.minor),&input.info);
+                                    mk_kdev(input.major,input.minor),&input.info);
                 EXIT;
                 return error;
         }