[Gc-linux-cvs] linux/drivers/block Kconfig,1.13,1.14 Makefile,1.11,1.12

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Added an alternate DVD driver.
This driver allows using DVD-R media like in a normal DVD drive.
Currently, only drive 04 (20020402) is supported. Support for drive 06 and 08
should be easily added.
By default, the driver will reject original media.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Kconfig	8 Apr 2005 14:39:16 -0000	1.13
+++ Kconfig	14 May 2005 21:40:12 -0000	1.14
@@ -61,9 +61,20 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called z2ram.
 
+config GAMECUBE_DI
+	tristate "Nintendo Gamecube (alternate) DVD support"
+	depends on GAMECUBE && !GAMECUBE_DVDCOVER && EXPERIMENTAL
+	help
+	  This enables support for using DVD-R media on
+	  the Nintendo GameCube DVD drive.
+	  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 GAMECUBE_DVD
 	tristate "Nintendo Gamecube DVD"
-	depends on GAMECUBE
+	depends on GAMECUBE && !GAMECUBE_DI && !GAMECUBE_DVDCOVER
 	help
 	  This enables support for using the mini-DVD drive on the 
 	  Nintendo Gamecube.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	8 Apr 2005 14:39:16 -0000	1.11
+++ Makefile	14 May 2005 21:40:12 -0000	1.12
@@ -28,10 +28,11 @@
 obj-$(CONFIG_ATARI_ACSI)	+= acsi.o
 obj-$(CONFIG_ATARI_SLM)		+= acsi_slm.o
 obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o
+obj-$(CONFIG_GAMECUBE_DI)	+= gcn-di/
+obj-$(CONFIG_GAMECUBE_DVD)	+= gcn-dvd/
 obj-$(CONFIG_GAMECUBE_ARAM)	+= gcn-aram.o
 obj-$(CONFIG_GAMECUBE_MEMCARD)	+= gcn-memcard.o
 obj-$(CONFIG_GAMECUBE_SD)	+= gcn-sd.o
-obj-$(CONFIG_GAMECUBE_DVD)      += gcn-dvd/
 obj-$(CONFIG_BLK_DEV_RAM)	+= rd.o
 obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o
 obj-$(CONFIG_BLK_DEV_PS2)	+= ps2esdi.o