[PATCH] BLK_DEV_IDE_CELLEB dependency fix

[PATCH] BLK_DEV_IDE_CELLEB dependency fix

[Akira Iguchi]

It's bool and it depends on BLK_DEV_IDE
 => should depend on BLK_DEV_IDE=y

And move it to "if BLK_DEV_IDEDMA_PCI" block because it depends on 
BLK_DEV_IDEDMA_PCI.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
---

diff -Nrpu -X linux-2.6.21-rc3/Documentation/dontdiff linux-2.6.21-rc3/drivers/ide/Kconfig linux-2.6.21-rc3.mod/drivers/ide/Kconfig
--- linux-2.6.21-rc3/drivers/ide/Kconfig	2007-03-07 13:41:20.000000000 +0900
+++ linux-2.6.21-rc3.mod/drivers/ide/Kconfig	2007-03-15 23:49:33.000000000 +0900
@@ -769,6 +769,14 @@ config BLK_DEV_TC86C001
 	help
 	This driver adds support for Toshiba TC86C001 GOKU-S chip.
 
+config BLK_DEV_IDE_CELLEB
+	bool "Toshiba's Cell Reference Set IDE support"
+	depends on PPC_CELLEB && BLK_DEV_IDE=y
+	help
+	  This driver provides support for the built-in IDE controller on
+	  Toshiba Cell Reference Board.
+	  If unsure, say Y.
+
 endif
 
 config BLK_DEV_IDE_PMAC
@@ -800,14 +808,6 @@ config BLK_DEV_IDEDMA_PMAC
 	  to transfer data to and from memory.  Saying Y is safe and improves
 	  performance.
 
-config BLK_DEV_IDE_CELLEB
-	bool "Toshiba's Cell Reference Set IDE support"
-	depends on PPC_CELLEB
-	help
-	  This driver provides support for the built-in IDE controller on
-	  Toshiba Cell Reference Board.
-	  If unsure, say Y.
-
 config BLK_DEV_IDE_SWARM
 	tristate "IDE for Sibyte evaluation boards"
 	depends on SIBYTE_SB1xxx_SOC

Re: [PATCH] BLK_DEV_IDE_CELLEB dependency fix

[Sergei Shtylyov]

Hello.

Akira Iguchi wrote:

> It's bool and it depends on BLK_DEV_IDE
>  => should depend on BLK_DEV_IDE=y

    Hm, why I'm seeing module_init() in the driver? :-)

> And move it to "if BLK_DEV_IDEDMA_PCI" block because it depends on 
> BLK_DEV_IDEDMA_PCI.

    IMHO, that driver shouldn't be in drivers/ide/ppc/ then...  Why it got 
there (the same question about PowerMac driver)?

> diff -Nrpu -X linux-2.6.21-rc3/Documentation/dontdiff linux-2.6.21-rc3/drivers/ide/Kconfig linux-2.6.21-rc3.mod/drivers/ide/Kconfig
> --- linux-2.6.21-rc3/drivers/ide/Kconfig	2007-03-07 13:41:20.000000000 +0900
> +++ linux-2.6.21-rc3.mod/drivers/ide/Kconfig	2007-03-15 23:49:33.000000000 +0900
> @@ -769,6 +769,14 @@ config BLK_DEV_TC86C001
>  	help
>  	This driver adds support for Toshiba TC86C001 GOKU-S chip.
>  
> +config BLK_DEV_IDE_CELLEB
> +	bool "Toshiba's Cell Reference Set IDE support"
> +	depends on PPC_CELLEB && BLK_DEV_IDE=y
> +	help
> +	  This driver provides support for the built-in IDE controller on
> +	  Toshiba Cell Reference Board.
> +	  If unsure, say Y.
> +
>  endif
>  
>  config BLK_DEV_IDE_PMAC
> @@ -800,14 +808,6 @@ config BLK_DEV_IDEDMA_PMAC
>  	  to transfer data to and from memory.  Saying Y is safe and improves
>  	  performance.
>  
> -config BLK_DEV_IDE_CELLEB
> -	bool "Toshiba's Cell Reference Set IDE support"
> -	depends on PPC_CELLEB
> -	help
> -	  This driver provides support for the built-in IDE controller on
> -	  Toshiba Cell Reference Board.
> -	  If unsure, say Y.
> -
>  config BLK_DEV_IDE_SWARM
>  	tristate "IDE for Sibyte evaluation boards"
>  	depends on SIBYTE_SB1xxx_SOC

MBR, Sergei

Re: [PATCH] BLK_DEV_IDE_CELLEB dependency fix

[Benjamin Herrenschmidt]

On Thu, 2007-03-15 at 17:30 +0300, Sergei Shtylyov wrote:
> Hello.
> 
> Akira Iguchi wrote:
> 
> > It's bool and it depends on BLK_DEV_IDE
> >  => should depend on BLK_DEV_IDE=y
> 
>     Hm, why I'm seeing module_init() in the driver? :-)
> 
> > And move it to "if BLK_DEV_IDEDMA_PCI" block because it depends on 
> > BLK_DEV_IDEDMA_PCI.
> 
>     IMHO, that driver shouldn't be in drivers/ide/ppc/ then...  Why it got 
> there (the same question about PowerMac driver)?

Not sure... some reorg changes ide-pmac.c into ppc/pmac.c or such, I
don't remember who did it tho.

Ben.