[linuxsh-dev] 2.5.13

[NIIBE Y. <gn...@m1...>]

Changes from mainline.

2002-05-06  NIIBE Yutaka  <gn...@m1...>

	* AGAINST-2.5.13: New file.
	* AGAINST-2.5.12: Removed.
	* Makefile: Version 2.5.13.

	* Makefile, drivers/block/rd.c, drivers/net/Config.in, 
	drivers/pci/pci.ids: Incorporate changes in 2.5.13.

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.20
diff -u -3 -p -r1.20 Makefile
--- Makefile	1 May 2002 06:18:01 -0000	1.20
+++ Makefile	6 May 2002 00:47:34 -0000
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 12
+SUBLEVEL = 13
 EXTRAVERSION =-sh
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -141,7 +141,7 @@ DRIVERS-$(CONFIG_AGP) += drivers/char/ag
 DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
 DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
 DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
-DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
+DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
 DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
 DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
 DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
Index: drivers/block/rd.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v
retrieving revision 1.10
diff -u -3 -p -r1.10 rd.c
--- drivers/block/rd.c	1 May 2002 06:18:01 -0000	1.10
+++ drivers/block/rd.c	6 May 2002 00:47:34 -0000
@@ -73,8 +73,6 @@ int initrd_below_start_ok;
  */
 
 static unsigned long rd_length[NUM_RAMDISKS];	/* Size of RAM disks in bytes   */
-static int rd_hardsec[NUM_RAMDISKS];		/* Size of real blocks in bytes */
-static int rd_blocksizes[NUM_RAMDISKS];		/* Size of 1024 byte blocks :)  */
 static int rd_kbsize[NUM_RAMDISKS];	/* Size in blocks of 1024 bytes */
 static devfs_handle_t devfs_handle;
 static struct block_device *rd_bdev[NUM_RAMDISKS];/* Protected device data */
@@ -430,8 +428,6 @@ static int __init rd_init (void)
 	for (i = 0; i < NUM_RAMDISKS; i++) {
 		/* rd_size is given in kB */
 		rd_length[i] = rd_size << 10;
-		rd_hardsec[i] = rd_blocksize;
-		rd_blocksizes[i] = rd_blocksize;
 		rd_kbsize[i] = rd_size;
 	}
 	devfs_handle = devfs_mk_dir (NULL, "rd", NULL);
@@ -451,7 +447,6 @@ static int __init rd_init (void)
 			INITRD_MINOR, S_IFBLK | S_IRUSR, &rd_bd_op, NULL);
 #endif
 
-	blksize_size[MAJOR_NR] = rd_blocksizes;	/* Avoid set_blocksize() check */
 	blk_size[MAJOR_NR] = rd_kbsize;		/* Size of the RAM disk in kB  */
 
 	/* rd_size is given in kB */
Index: drivers/net/Config.in
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/net/Config.in,v
retrieving revision 1.8
diff -u -3 -p -r1.8 Config.in
--- drivers/net/Config.in	5 Apr 2002 04:45:00 -0000	1.8
+++ drivers/net/Config.in	6 May 2002 00:47:34 -0000
@@ -3,7 +3,6 @@
 #
 
 source drivers/net/arcnet/Config.in
-source drivers/net/appletalk/Config.in
 
 tristate 'Dummy net driver support' CONFIG_DUMMY
 tristate 'Bonding driver support' CONFIG_BONDING
Index: drivers/pci/pci.ids
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v
retrieving revision 1.10
diff -u -3 -p -r1.10 pci.ids
--- drivers/pci/pci.ids	1 May 2002 06:18:01 -0000	1.10
+++ drivers/pci/pci.ids	6 May 2002 00:47:34 -0000
@@ -2927,10 +2927,12 @@
 	0105  Cyclom_8Y above first megabyte
 	0200  Cyclom_Z below first megabyte
 	0201  Cyclom_Z above first megabyte
-	0300  PC300 RX 2
-	0301  PC300 RX 1
-	0310  PC300 TE 2
-	0311  PC300 TE 1
+	0300  PC300/RSV or /X21 (2 ports)
+	0301  PC300/RSV or /X21 (1 ports)
+	0310  PC300/TE (2 ports)
+	0311  PC300/TE (1 port)
+	0320  PC300/TE-M (2 ports)
+	0321  PC300/TE-M (1 port)
 120f  Essential Communications
 	0001  Roadrunner serial HIPPI
 1210  Hyperparallel Technologies