Commit a1067db8 authored by Kou Ishizaki's avatar Kou Ishizaki Committed by Bartlomiej Zolnierkiewicz
Browse files

scc_pata: dependency fix 



This patch fixes:
* the dependency of scc_pata on BLK_DEV_IDEDMA_PCI
* incorrect link to ide-core
* move scc_pata from ide/ppc to ide/pci

Signed-off-by: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: default avatarAkira Iguchi <akira2.iguchi@toshiba.co.jp>
Cc: Al Viro <viro@ftp.linux.org.uk>,
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ebbc2031

drivers/ide/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -769,6 +769,14 @@ config BLK_DEV_TC86C001 
	help

	This driver adds support for Toshiba TC86C001 GOKU-S chip.



config BLK_DEV_CELLEB

	tristate "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.



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 && IDE=y

	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

drivers/ide/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ ide-core-$(CONFIG_BLK_DEV_Q40IDE) += legacy/q40ide.o 
# built-in only drivers from ppc/

ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= ppc/mpc8xx.o

ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)	+= ppc/pmac.o

ide-core-$(CONFIG_BLK_DEV_IDE_CELLEB)	+= ppc/scc_pata.o



# built-in only drivers from h8300/

ide-core-$(CONFIG_H8300)		+= h8300/ide-h8300.o

drivers/ide/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_BLK_DEV_AEC62XX) += aec62xx.o 
obj-$(CONFIG_BLK_DEV_ALI15X3)		+= alim15x3.o

obj-$(CONFIG_BLK_DEV_AMD74XX)		+= amd74xx.o

obj-$(CONFIG_BLK_DEV_ATIIXP)		+= atiixp.o

obj-$(CONFIG_BLK_DEV_CELLEB)		+= scc_pata.o

obj-$(CONFIG_BLK_DEV_CMD64X)		+= cmd64x.o

obj-$(CONFIG_BLK_DEV_CS5520)		+= cs5520.o

obj-$(CONFIG_BLK_DEV_CS5530)		+= cs5530.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE