[Gc-linux-cvs] linux/drivers/block Kconfig, 1.23, 1.24 gcn-aram.c, 1.12, 1.13

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22637/drivers/block

Modified Files:
	Kconfig gcn-aram.c 
Log Message:
Merged 2.6.19.


Index: gcn-aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gcn-aram.c	17 Feb 2007 23:43:40 -0000	1.12
+++ gcn-aram.c	18 Feb 2007 22:56:01 -0000	1.13
@@ -173,7 +173,7 @@
 /*
  * Handles ARAM interrupts.
  */
-static irqreturn_t aram_irq_handler(int irq, void *dev0, struct pt_regs *regs)
+static irqreturn_t aram_irq_handler(int irq, void *dev0)
 {
 	struct aram_device *adev = dev0;
 	struct request *req;

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Kconfig	17 Feb 2007 23:43:40 -0000	1.23
+++ Kconfig	18 Feb 2007 22:56:01 -0000	1.24
@@ -2,6 +2,8 @@
 # Block device driver configuration
 #
 
+if BLOCK
+
 menu "Block devices"
 
 config BLK_DEV_FD
@@ -267,8 +269,7 @@
 	  module will be called umem.
 
 	  The umem driver has not yet been allocated a MAJOR number, so
-	  one is chosen dynamically.  Use "devfs" or look in /proc/devices
-	  for the device number
+	  one is chosen dynamically.
 
 config BLK_DEV_UBD
 	bool "Virtual block device"
@@ -467,7 +468,7 @@
 	depends on BLK_DEV_RAM
 	default "1024"
 	help
-	  The default value is 1024 kilobytes.  PAGE_SIZE is a much more
+	  The default value is 1024 bytes.  PAGE_SIZE is a much more
 	  efficient choice however.  The default is kept to ensure initrd
 	  setups function - apparently needed by the rd_load_image routine
 	  that supposes the filesystem in the image uses a 1024 blocksize.
@@ -530,3 +531,5 @@
 	devices like the Coraid EtherDrive (R) Storage Blade.
 
 endmenu
+
+endif