Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
Cc: Al Viro <viro@ftp.linux.org.uk>,
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

authored by

Kou Ishizaki and committed by
Bartlomiej Zolnierkiewicz
a1067db8 ebbc2031

+9 -9
+8 -8
drivers/ide/Kconfig
··· 769 769 help 770 770 This driver adds support for Toshiba TC86C001 GOKU-S chip. 771 771 772 + config BLK_DEV_CELLEB 773 + tristate "Toshiba's Cell Reference Set IDE support" 774 + depends on PPC_CELLEB 775 + help 776 + This driver provides support for the built-in IDE controller on 777 + Toshiba Cell Reference Board. 778 + If unsure, say Y. 779 + 772 780 endif 773 781 774 782 config BLK_DEV_IDE_PMAC ··· 807 799 Power Macintoshes and PowerBooks to use DMA (direct memory access) 808 800 to transfer data to and from memory. Saying Y is safe and improves 809 801 performance. 810 - 811 - config BLK_DEV_IDE_CELLEB 812 - bool "Toshiba's Cell Reference Set IDE support" 813 - depends on PPC_CELLEB && IDE=y 814 - help 815 - This driver provides support for the built-in IDE controller on 816 - Toshiba Cell Reference Board. 817 - If unsure, say Y. 818 802 819 803 config BLK_DEV_IDE_SWARM 820 804 tristate "IDE for Sibyte evaluation boards"
-1
drivers/ide/Makefile
··· 37 37 # built-in only drivers from ppc/ 38 38 ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o 39 39 ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o 40 - ide-core-$(CONFIG_BLK_DEV_IDE_CELLEB) += ppc/scc_pata.o 41 40 42 41 # built-in only drivers from h8300/ 43 42 ide-core-$(CONFIG_H8300) += h8300/ide-h8300.o
+1
drivers/ide/pci/Makefile
··· 3 3 obj-$(CONFIG_BLK_DEV_ALI15X3) += alim15x3.o 4 4 obj-$(CONFIG_BLK_DEV_AMD74XX) += amd74xx.o 5 5 obj-$(CONFIG_BLK_DEV_ATIIXP) += atiixp.o 6 + obj-$(CONFIG_BLK_DEV_CELLEB) += scc_pata.o 6 7 obj-$(CONFIG_BLK_DEV_CMD64X) += cmd64x.o 7 8 obj-$(CONFIG_BLK_DEV_CS5520) += cs5520.o 8 9 obj-$(CONFIG_BLK_DEV_CS5530) += cs5530.o
drivers/ide/ppc/scc_pata.c drivers/ide/pci/scc_pata.c