Merge to 2.1.38.

IMPORTANT NOTE:  I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:

include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h

3 files changed, 19 insertions, 9 deletions

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 740a3780a..e14cf09c7 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -370,7 +370,7 @@ static void redo_acsi_request( void );
 static int acsi_ioctl( struct inode *inode, struct file *file, unsigned int
                        cmd, unsigned long arg );
 static int acsi_open( struct inode * inode, struct file * filp );
-static void acsi_release( struct inode * inode, struct file * file );
+static int acsi_release( struct inode * inode, struct file * file );
 static void acsi_prevent_removal( int target, int flag );
 static int acsi_change_blk_size( int target, int lun);
 static int acsi_mode_sense( int target, int lun, SENSE_DATA *sd );
@@ -1200,7 +1200,7 @@ static int acsi_open( struct inode * inode, struct file * filp )
  * be forgotten about...
  */
 
-static void acsi_release( struct inode * inode, struct file * file )
+static int acsi_release( struct inode * inode, struct file * file )
 {
 	int device;
 
@@ -1210,6 +1210,7 @@ static void acsi_release( struct inode * inode, struct file * file )
 	if (--access_count[device] == 0 && acsi_info[device].removable)
 		acsi_prevent_removal(device, 0);
 	MOD_DEC_USE_COUNT;
+	return( 0 );
 }
 
 /*
@@ -1821,7 +1822,7 @@ void cleanup_module(void)
 {
 	del_timer( &acsi_timer );
 	blk_dev[MAJOR_NR].request_fn = 0;
-	free_pages( acsi_buffer, ACSI_BUFFER_ORDER );
+	free_pages( (unsigned long)acsi_buffer, ACSI_BUFFER_ORDER );
 
 	if (unregister_blkdev( MAJOR_NR, "ad" ) != 0)
 		printk( KERN_ERR "acsi: cleanup_module failed\n");
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index da9af49b0..97957c0ea 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -117,7 +117,9 @@ static char slmreqsense_cmd[6] = { 0x03, 0, 0, 0, 0, 0 };
 static char slmprint_cmd[6]    = { 0x0a, 0, 0, 0, 0, 0 };
 static char slminquiry_cmd[6]  = { 0x12, 0, 0, 0, 0, 0x80 };
 static char slmmsense_cmd[6]   = { 0x1a, 0, 0, 0, 255, 0 };
+#if 0
 static char slmmselect_cmd[6]  = { 0x15, 0, 0, 0, 0, 0 };
+#endif
 
 
 #define	MAX_SLM		2
@@ -262,11 +264,13 @@ static long slm_write( struct inode *node, struct file *file, const char *buf,
 static int slm_ioctl( struct inode *inode, struct file *file, unsigned int
                       cmd, unsigned long arg );
 static int slm_open( struct inode *inode, struct file *file );
-static void slm_release( struct inode *inode, struct file *file );
+static int slm_release( struct inode *inode, struct file *file );
 static int slm_req_sense( int device );
 static int slm_mode_sense( int device, char *buffer, int abs_flag );
+#if 0
 static int slm_mode_select( int device, char *buffer, int len, int
                             default_flag );
+#endif
 static int slm_get_pagesize( int device, int *w, int *h );
 
 /************************* End of Prototypes **************************/
@@ -794,7 +798,7 @@ static int slm_open( struct inode *inode, struct file *file )
 }
 
 
-static void slm_release( struct inode *inode, struct file *file )
+static int slm_release( struct inode *inode, struct file *file )
 
 {	int device;
 	struct slm *sip;
@@ -806,6 +810,8 @@ static void slm_release( struct inode *inode, struct file *file )
 		sip->wbusy = 0;
 	if (file->f_mode & 1)
 		sip->rbusy = 0;
+	
+	return( 0 );
 }
 
 
@@ -876,6 +882,8 @@ static int slm_mode_sense( int device, char *buffer, int abs_flag )
 }
 
 
+#if 0
+/* currently unused */
 static int slm_mode_select( int device, char *buffer, int len,
 							int default_flag )
 
@@ -911,6 +919,7 @@ static int slm_mode_select( int device, char *buffer, int len,
 	stdma_release();
 	return( rv );
 }
+#endif
 
 
 static int slm_get_pagesize( int device, int *w, int *h )
diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 0217dcb52..1ee709737 100644
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -979,14 +979,14 @@ static inline void setup_dev(struct gendisk *dev)
 __initfunc(void device_setup(void))
 {
 	extern void console_map_init(void);
-#ifdef CONFIG_PNP_PARPORT
-	extern int pnp_parport_init(void);
+#ifdef CONFIG_PARPORT
+	extern int parport_init(void);
 #endif
 	struct gendisk *p;
 	int nr=0;
 
-#ifdef CONFIG_PNP_PARPORT
-	pnp_parport_init();
+#ifdef CONFIG_PARPORT
+	parport_init();
 #endif
 	chr_dev_init();
 	blk_dev_init();