[Gc-linux-cvs] linux/drivers/block Kconfig, 1.40, 1.41 Makefile, 1.28, 1.29

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

Update of /cvsroot/gc-linux/linux/drivers/block
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32669/drivers/block

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile	25 Oct 2009 18:53:45 -0000	1.28
--- Makefile	25 Oct 2009 18:56:56 -0000	1.29
***************
*** 24,27 ****
--- 24,28 ----
  obj-$(CONFIG_MG_DISK)		+= mg_disk.o
  obj-$(CONFIG_SUNVDC)		+= sunvdc.o
+ obj-$(CONFIG_BLK_DEV_OSD)	+= osdblk.o
  
  obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Kconfig	25 Oct 2009 18:53:45 -0000	1.40
--- Kconfig	25 Oct 2009 18:56:56 -0000	1.41
***************
*** 113,117 ****
  	  disks. Select this option to access any disks in your GD ROM drive.
  	  Most users will want to say "Y" here.
! 	  You can also build this as a module which will be called gdrom.ko
  
  source "drivers/block/paride/Kconfig"
--- 113,117 ----
  	  disks. Select this option to access any disks in your GD ROM drive.
  	  Most users will want to say "Y" here.
! 	  You can also build this as a module which will be called gdrom.
  
  source "drivers/block/paride/Kconfig"
***************
*** 299,302 ****
--- 299,318 ----
  	  If unsure, say N.
  
+ config BLK_DEV_OSD
+ 	tristate "OSD object-as-blkdev support"
+ 	depends on SCSI_OSD_ULD
+ 	---help---
+ 	  Saying Y or M here will allow the exporting of a single SCSI
+ 	  OSD (object-based storage) object as a Linux block device.
+ 
+ 	  For example, if you create a 2G object on an OSD device,
+ 	  you can then use this module to present that 2G object as
+ 	  a Linux block device.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called osdblk.
+ 
+ 	  If unsure, say N.
+ 
  config BLK_DEV_SX8
  	tristate "Promise SATA SX8 support"
***************
*** 413,417 ****
  config MG_DISK
  	tristate "mGine mflash, gflash support"
! 	depends on ARM && ATA && GPIOLIB
  	help
  	  mGine mFlash(gFlash) block device driver
--- 429,433 ----
  config MG_DISK
  	tristate "mGine mflash, gflash support"
! 	depends on ARM && GPIOLIB
  	help
  	  mGine mFlash(gFlash) block device driver
***************
*** 439,443 ****
  config XILINX_SYSACE
  	tristate "Xilinx SystemACE support"
! 	depends on 4xx
  	help
  	  Include support for the Xilinx SystemACE CompactFlash interface
--- 455,459 ----
  config XILINX_SYSACE
  	tristate "Xilinx SystemACE support"
! 	depends on 4xx || MICROBLAZE
  	help
  	  Include support for the Xilinx SystemACE CompactFlash interface