[Gc-linux-cvs] linux/drivers/block Kconfig, 1.43, 1.44 Makefile, 1.31, 1.32

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

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/drivers/block

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.32.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Kconfig	9 Dec 2009 18:18:06 -0000	1.43
--- Kconfig	9 Dec 2009 18:44:55 -0000	1.44
***************
*** 64,67 ****
--- 64,143 ----
  	  module will be called z2ram.
  
+ config GAMECUBE_SD
+ 	tristate "Nintendo GameCube/Wii MMC/SD card"
+ 	depends on GAMECUBE_EXI
+ 	help
+ 	  This enables support for using SD and MMC cards through
+ 	  the Nintendo SD Card Adapter (DOL-019) or compatible hardware.
+ 
+ 	  You probably want to compile FAT support, and the required
+ 	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
+ 	  filesystems and Filesystems -> Native Language Support
+ 
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-sd.
+ 
+ config GAMECUBE_ARAM
+ 	tristate "Nintendo GameCube Auxiliary RAM (ARAM)"
+ 	depends on GAMECUBE
+ 	help
+ 	  This enables support for using the 16MB of ARAM found in the
+ 	  Nintendo GameCube as a block device.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-aram.
+ 
+ config GAMECUBE_DI
+ 	tristate "Nintendo GameCube Disk Interface (DI)"
+ 	depends on GAMECUBE
+ 	help
+ 	  This enables support for using the DVD drive unit found
+ 	  in the Nintendo GameCube.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-di.
+ 
+ config WII_MEM2
+ 	tristate "Nintendo Wii MEM2"
+ 	depends on WII
+ 	help
+ 	  This enables support for using the MEM2 found in the
+ 	  Nintendo Wii as a block device.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-mem2.
+ 
+ config WII_SD
+ 	tristate "Nintendo Wii front slot MMC/SD"
+ 	depends on STARLET_IOS
+ 	help
+ 	  This enables support for MMC/SD cards using the front SD card
+ 	  slot of the Nintendo Wii.
+ 
+ 	  You probably want to compile FAT support, and the required
+ 	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
+ 	  filesystems and Filesystems -> Native Language Support
+ 
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-stsd.
+ 
+ config WII_DI
+ 	tristate "Nintendo Wii Disk Interface (DI)"
+ 	depends on STARLET_MINI
+ 	help
+ 	  This enables support for using the DVD drive unit found
+ 	  in the Nintendo Wii.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-di.
+ 
  config BLK_DEV_XD
  	tristate "XT hard disk support"

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Makefile	9 Dec 2009 18:18:06 -0000	1.31
--- Makefile	9 Dec 2009 18:44:55 -0000	1.32
***************
*** 14,17 ****
--- 14,23 ----
  obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
  obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o
+ obj-$(CONFIG_GAMECUBE_SD)	+= gcn-sd.o
+ obj-$(CONFIG_GAMECUBE_ARAM)	+= gcn-aram.o
+ obj-$(CONFIG_GAMECUBE_DI)	+= gcn-di/
+ obj-$(CONFIG_WII_MEM2)		+= rvl-mem2.o
+ obj-$(CONFIG_WII_SD)		+= rvl-stsd.o
+ obj-$(CONFIG_WII_DI)		+= rvl-di.o
  obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o
  obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o