Merge bk://linux.bkbits.net/linux-2.5

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

crypto/des.c

@@ -1269,6 +1269,8 @@ static struct crypto_alg des3_ede_alg = {
 	.cia_decrypt	  	=	des3_ede_decrypt } }
 };
 
+MODULE_ALIAS("des3_ede");
+
 static int __init init(void)
 {
 	int ret = 0;

crypto/sha512.c

@@ -348,6 +348,8 @@ static struct crypto_alg sha384 = {
         }
 };
 
+MODULE_ALIAS("sha384");
+
 static int __init init(void)
 {
         int ret = 0;

drivers/media/dvb/frontends/alps_tdlb7.c

@@ -36,6 +36,7 @@
 #include <linux/fs.h>
 #include <linux/unistd.h>
 #include <linux/delay.h>
+#include <linux/syscalls.h>
 
 #include "dvb_frontend.h"
 #include "dvb_functions.h"

drivers/media/dvb/frontends/sp887x.c

@@ -24,7 +24,7 @@
 #include <linux/fcntl.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
-
+#include <linux/syscalls.h>
 
 #include "dvb_frontend.h"
 #include "dvb_functions.h"

drivers/media/dvb/frontends/tda1004x.c

@@ -43,6 +43,8 @@
 #include <linux/unistd.h>
 #include <linux/fcntl.h>
 #include <linux/errno.h>
+#include <linux/syscalls.h>
+
 #include "dvb_frontend.h"
 #include "dvb_functions.h"
 

drivers/net/tg3.c

@@ -56,8 +56,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"3.2"
-#define DRV_MODULE_RELDATE	"April 26, 2004"
+#define DRV_MODULE_VERSION	"3.3"
+#define DRV_MODULE_RELDATE	"April 27, 2004"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -7038,7 +7038,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)
 		tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;
 
-	/* Note: 5705 also needs this flag set to improve bit error rate. */
+	/* Note: 5750 also needs this flag set to improve bit error rate. */
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
 		tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;
 

include/linux/compat_ioctl.h

@@ -73,6 +73,7 @@ COMPATIBLE_IOCTL(HDIO_SET_NOWERR)
 COMPATIBLE_IOCTL(HDIO_SET_32BIT)
 COMPATIBLE_IOCTL(HDIO_SET_MULTCOUNT)
 COMPATIBLE_IOCTL(HDIO_DRIVE_CMD)
+COMPATIBLE_IOCTL(HDIO_DRIVE_TASK)
 COMPATIBLE_IOCTL(HDIO_SET_PIO_MODE)
 COMPATIBLE_IOCTL(HDIO_SET_NICE)
 /* 0x02 -- Floppy ioctls */