Merge with Linux 2.3.51.

8 files changed, 37 insertions, 16 deletions

diff --git a/drivers/char/Config.in b/drivers/char/Config.in
index 920546763..18f867c04 100644
--- a/drivers/char/Config.in
+++ b/drivers/char/Config.in
@@ -140,7 +140,9 @@ fi
 
 tristate '/dev/nvram support' CONFIG_NVRAM
 tristate 'Enhanced Real Time Clock Support' CONFIG_RTC
-bool 'EFI Real Time Clock Services' CONFIG_EFI_RTC
+if [ "$CONFIG_IA64" = "y" ]; then
+   bool 'EFI Real Time Clock Services' CONFIG_EFI_RTC
+fi
 if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
    bool 'Tadpole ANA H8 Support'  CONFIG_H8
 fi
@@ -207,8 +209,8 @@ if [ "$CONFIG_VIDEO_DEV" != "n" ]; then
 	 dep_tristate '  QuickCam Colour Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT
       fi
    fi
-   dep_tristate '  SAA5249 Teletext processor' CONFIG_VIDEO_SAA5249 $CONFIG_VIDEO_DEV
-   dep_tristate '  SAB3036 tuner' CONFIG_TUNER_3036 $CONFIG_VIDEO_DEV
+   dep_tristate '  SAA5249 Teletext processor' CONFIG_VIDEO_SAA5249 $CONFIG_VIDEO_DEV $CONFIG_I2C
+   dep_tristate '  SAB3036 tuner' CONFIG_TUNER_3036 $CONFIG_VIDEO_DEV $CONFIG_I2C
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       if [ "$CONFIG_SGI" = "y" ]; then
          dep_tristate '  SGI Vino Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_VINO $CONFIG_VIDEO_DEV $CONFIG_SGI
diff --git a/drivers/char/README.epca b/drivers/char/README.epca
index da2e11400..d95ff1fed 100644
--- a/drivers/char/README.epca
+++ b/drivers/char/README.epca
@@ -523,3 +523,10 @@ Description (Verbose) : Updated driver:
 Files affected        : epca.c
 Release version       : 1.3.0.1-LK
 -----------------------------------------------------------------------
+Programmer            : Arjan van de Ven <adve@oce.nl>
+Date                  : March 10, 2000
+Description (Verbose) : Fixed includes to make it actually compile
+			for kernel 2.3.51
+Files affected        : epca.c
+Release version       : 1.3.0.2-LK
+-----------------------------------------------------------------------
diff --git a/drivers/char/bttv.c b/drivers/char/bttv.c
index 82f545ecc..19e252968 100644
--- a/drivers/char/bttv.c
+++ b/drivers/char/bttv.c
@@ -20,7 +20,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 8ed17fd71..ac27c9e0e 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -1,9 +1,9 @@
 /*
  * The DSP56001 Device Driver, saviour of the Free World(tm)
  *
- * Authors: Fredrik Noring   <noring@lysator.liu.se>
- *          lars brinkhoff   <f93labr@dd.chalmers.se>
- *          Tomas Berndtsson <tobe@lysator.liu.se>
+ * Authors: Fredrik Noring   <noring@nocrew.org>
+ *          lars brinkhoff   <lars@nocrew.org>
+ *          Tomas Berndtsson <tomas@nocrew.org>
  *
  * First version May 1996
  *
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 31cd5546c..dd94223bc 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -38,7 +38,10 @@
 #include <linux/ctype.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
 #include <asm/uaccess.h>
+#include <asm/io.h>
 
 #ifdef CONFIG_PCI
 #define ENABLE_PCI
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 2ca3145d9..3bf3fbf28 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -52,6 +52,7 @@ extern int videodev_init(void);
 #endif
 #ifdef CONFIG_FB
 extern void fbmem_init(void);
+extern void fbconsole_init(void);
 #endif
 #ifdef CONFIG_PROM_CONSOLE
 extern void prom_con_init(void);
@@ -620,6 +621,7 @@ int __init chr_dev_init(void)
 #endif
 #if defined (CONFIG_FB)
 	fbmem_init();
+	fbconsole_init();
 #endif
 #if defined (CONFIG_PROM_CONSOLE)
 	prom_con_init();
diff --git a/drivers/char/radio-miropcm20.c b/drivers/char/radio-miropcm20.c
index 04beea2d5..15985380b 100644
--- a/drivers/char/radio-miropcm20.c
+++ b/drivers/char/radio-miropcm20.c
@@ -10,7 +10,7 @@
 #include <linux/init.h>			/* Initdata			*/
 #include <asm/uaccess.h>		/* copy to/from user		*/
 #include <linux/videodev.h>		/* kernel radio structs		*/
-#include "../sound/lowlevel/miroaci.h"	/* ACI Control by acimixer	*/
+#include "../sound/miroaci.h"		/* ACI Control by acimixer      */
 
 static int users = 0;
 
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 61dfd6e42..a7c1b0703 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -197,14 +197,17 @@ int raw_ctl_ioctl(struct inode *inode,
 			raw_device_bindings[minor] = 
 				bdget(kdev_t_to_nr(MKDEV(rq.block_major, rq.block_minor)));
 		} else {
+			struct block_device *bdev;
 			kdev_t dev;
-			if (!raw_device_bindings[minor]) {
-				err = -ENODEV;
-				break;
+
+			bdev = raw_device_bindings[minor];
+			if (bdev) {
+				dev = to_kdev_t(bdev->bd_dev);
+				rq.block_major = MAJOR(dev);
+				rq.block_minor = MINOR(dev);
+			} else {
+				rq.block_major = rq.block_minor = 0;
 			}
-			dev = to_kdev_t(raw_device_bindings[minor]->bd_dev);
-			rq.block_major = MAJOR(dev);
-			rq.block_minor = MINOR(dev);
 			err = copy_to_user((void *) arg, &rq, sizeof(rq));
 		}
 		break;
@@ -304,7 +307,12 @@ ssize_t	rw_raw_dev(int rw, struct file *filp, char *buf,
 		err = map_user_kiobuf(rw, iobuf, (unsigned long) buf, iosize);
 		if (err)
 			break;
-		
+#if 0
+		err = lock_kiovec(1, &iobuf, 1);
+		if (err) 
+			break;
+#endif
+	
 		for (i=0; i < blocks; i++) 
 			b[i] = blocknr++;
 		
@@ -316,7 +324,7 @@ ssize_t	rw_raw_dev(int rw, struct file *filp, char *buf,
 			buf += err;
 		}
 
-		unmap_kiobuf(iobuf);
+		unmap_kiobuf(iobuf); /* The unlock_kiobuf is implicit here */
 
 		if (err != iosize)
 			break;