[Gc-linux-cvs] linux/drivers/block Kconfig, 1.37, 1.38 Makefile, 1.25, 1.26

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Makefile	25 Oct 2009 18:33:47 -0000	1.25
--- Makefile	25 Oct 2009 18:45:35 -0000	1.26
***************
*** 7,10 ****
--- 7,11 ----
  
  obj-$(CONFIG_MAC_FLOPPY)	+= swim3.o
+ obj-$(CONFIG_BLK_DEV_SWIM)	+= swim_mod.o
  obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o
  obj-$(CONFIG_AMIGA_FLOPPY)	+= amiflop.o
***************
*** 21,24 ****
--- 22,26 ----
  obj-$(CONFIG_XILINX_SYSACE)	+= xsysace.o
  obj-$(CONFIG_CDROM_PKTCDVD)	+= pktcdvd.o
+ obj-$(CONFIG_MG_DISK)		+= mg_disk.o
  obj-$(CONFIG_SUNVDC)		+= sunvdc.o
  
***************
*** 34,35 ****
--- 36,39 ----
  
  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
+ 
+ swim_mod-objs	:= swim.o swim_asm.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Kconfig	25 Oct 2009 18:33:46 -0000	1.37
--- Kconfig	25 Oct 2009 18:45:35 -0000	1.38
***************
*** 46,49 ****
--- 46,56 ----
  	  floppy controller, say Y here. Most commonly found in PowerMacs.
  
+ config BLK_DEV_SWIM
+ 	tristate "Support for SWIM Macintosh floppy"
+ 	depends on M68K && MAC
+ 	help
+ 	  You should select this option if you want floppy support
+ 	  and you don't have a II, IIfx, Q900, Q950 or AV series.
+ 
  config AMIGA_Z2RAM
  	tristate "Amiga Zorro II ramdisk support"
***************
*** 404,407 ****
--- 411,431 ----
  	devices like the Coraid EtherDrive (R) Storage Blade.
  
+ config MG_DISK
+ 	tristate "mGine mflash, gflash support"
+ 	depends on ARM && ATA && GPIOLIB
+ 	help
+ 	  mGine mFlash(gFlash) block device driver
+ 
+ config MG_DISK_RES
+ 	int "Size of reserved area before MBR"
+ 	depends on MG_DISK
+ 	default 0
+ 	help
+ 	  Define size of reserved area that usually used for boot. Unit is KB.
+ 	  All of the block device operation will be taken this value as start
+ 	  offset
+ 	  Examples:
+ 			1024 => 1 MB
+ 
  config SUNVDC
  	tristate "Sun Virtual Disk Client support"