diff options
author | Olaf Hering <olaf@aepfle.de> | 2006-12-06 23:39:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:43 -0500 |
commit | 9468f687d95d1825fd2f2c2f74e1a59429ef25d3 (patch) | |
tree | 818d315727eb4f512607183578736c7d1a5bd82d /drivers/ide | |
parent | 12d40e43d251de4fa1f982567fc8b4ee5e858367 (diff) |
[PATCH] winbond IDE depends on IDEDMA
winbond ide depends on idedma.
Move the option into the IDEDMA section.
drivers/built-in.o: In function `.sl82c105_ide_dma_timeout':
sl82c105.c:(.text+0x624d0): undefined reference to `.__ide_dma_timeout'
drivers/built-in.o: In function `.sl82c105_ide_dma_off_quietly':
sl82c105.c:(.text+0x6274c): undefined reference to `.__ide_dma_off_quietly'
drivers/built-in.o: In function `.sl82c105_ide_dma_on':
sl82c105.c:(.text+0x6284c): undefined reference to `.__ide_dma_on'
drivers/built-in.o: In function `.sl82c105_check_drive':
sl82c105.c:(.text+0x628ec): undefined reference to `.__ide_dma_bad_drive'
sl82c105.c:(.text+0x62934): undefined reference to `.__ide_dma_good_drive'
drivers/built-in.o: In function `.sl82c105_ide_dma_start':
sl82c105.c:(.text+0x62c24): undefined reference to `.ide_dma_start'
make[1]: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: "Bartlomiej Zolnierkiewicz" <bzolnier@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 0c68d0f0d8e5..e23bc0d62159 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -389,14 +389,6 @@ config BLK_DEV_RZ1000 | |||
389 | Linux. This may slow disk throughput by a few percent, but at least | 389 | Linux. This may slow disk throughput by a few percent, but at least |
390 | things will operate 100% reliably. | 390 | things will operate 100% reliably. |
391 | 391 | ||
392 | config BLK_DEV_SL82C105 | ||
393 | tristate "Winbond SL82c105 support" | ||
394 | depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI | ||
395 | help | ||
396 | If you have a Winbond SL82c105 IDE controller, say Y here to enable | ||
397 | special configuration for this chip. This is common on various CHRP | ||
398 | motherboards, but could be used elsewhere. If in doubt, say Y. | ||
399 | |||
400 | config BLK_DEV_IDEDMA_PCI | 392 | config BLK_DEV_IDEDMA_PCI |
401 | bool "Generic PCI bus-master DMA support" | 393 | bool "Generic PCI bus-master DMA support" |
402 | depends on PCI && BLK_DEV_IDEPCI | 394 | depends on PCI && BLK_DEV_IDEPCI |
@@ -712,6 +704,14 @@ config BLK_DEV_SIS5513 | |||
712 | 704 | ||
713 | Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>. | 705 | Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>. |
714 | 706 | ||
707 | config BLK_DEV_SL82C105 | ||
708 | tristate "Winbond SL82c105 support" | ||
709 | depends on (PPC || ARM) | ||
710 | help | ||
711 | If you have a Winbond SL82c105 IDE controller, say Y here to enable | ||
712 | special configuration for this chip. This is common on various CHRP | ||
713 | motherboards, but could be used elsewhere. If in doubt, say Y. | ||
714 | |||
715 | config BLK_DEV_SLC90E66 | 715 | config BLK_DEV_SLC90E66 |
716 | tristate "SLC90E66 chipset support" | 716 | tristate "SLC90E66 chipset support" |
717 | help | 717 | help |