* [PATCH] winbond IDE depends on IDEDMA
@ 2006-11-30 14:39 Olaf Hering
2006-11-30 17:26 ` Bartlomiej Zolnierkiewicz
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Olaf Hering @ 2006-11-30 14:39 UTC (permalink / raw)
To: Andrew Morton, linux-ide
winbond ide depends on idedma.
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>
---
drivers/ide/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6.19/drivers/ide/Kconfig
===================================================================
--- linux-2.6.19.orig/drivers/ide/Kconfig
+++ linux-2.6.19/drivers/ide/Kconfig
@@ -391,7 +391,7 @@ config BLK_DEV_RZ1000
config BLK_DEV_SL82C105
tristate "Winbond SL82c105 support"
- depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI
+ depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI && BLK_DEV_IDEDMA_PCI
help
If you have a Winbond SL82c105 IDE controller, say Y here to enable
special configuration for this chip. This is common on various CHRP
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] winbond IDE depends on IDEDMA
2006-11-30 14:39 [PATCH] winbond IDE depends on IDEDMA Olaf Hering
@ 2006-11-30 17:26 ` Bartlomiej Zolnierkiewicz
2006-11-30 18:25 ` Sergei Shtylyov
2006-11-30 18:52 ` Olaf Hering
2 siblings, 0 replies; 5+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2006-11-30 17:26 UTC (permalink / raw)
To: Olaf Hering; +Cc: Andrew Morton, linux-ide
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
On 11/30/06, Olaf Hering <olaf@aepfle.de> wrote:
>
> winbond ide depends on idedma.
>
> 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>
>
> ---
> drivers/ide/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6.19/drivers/ide/Kconfig
> ===================================================================
> --- linux-2.6.19.orig/drivers/ide/Kconfig
> +++ linux-2.6.19/drivers/ide/Kconfig
> @@ -391,7 +391,7 @@ config BLK_DEV_RZ1000
>
> config BLK_DEV_SL82C105
> tristate "Winbond SL82c105 support"
> - depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI
> + depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI && BLK_DEV_IDEDMA_PCI
> help
> If you have a Winbond SL82c105 IDE controller, say Y here to enable
> special configuration for this chip. This is common on various CHRP
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] winbond IDE depends on IDEDMA
2006-11-30 14:39 [PATCH] winbond IDE depends on IDEDMA Olaf Hering
2006-11-30 17:26 ` Bartlomiej Zolnierkiewicz
@ 2006-11-30 18:25 ` Sergei Shtylyov
2006-11-30 18:52 ` Olaf Hering
2 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2006-11-30 18:25 UTC (permalink / raw)
To: Olaf Hering; +Cc: Andrew Morton, linux-ide
Hello.
Olaf Hering wrote:
> winbond ide depends on idedma.
[...]
> Index: linux-2.6.19/drivers/ide/Kconfig
> ===================================================================
> --- linux-2.6.19.orig/drivers/ide/Kconfig
> +++ linux-2.6.19/drivers/ide/Kconfig
> @@ -391,7 +391,7 @@ config BLK_DEV_RZ1000
>
> config BLK_DEV_SL82C105
> tristate "Winbond SL82c105 support"
> - depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI
> + depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI && BLK_DEV_IDEDMA_PCI
> help
> If you have a Winbond SL82c105 IDE controller, say Y here to enable
> special configuration for this chip. This is common on various CHRP
This whole item should be moved below, under ifdef BLK_DEV_IDEDMA_PCI
then, for consistency. Please recast.
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] winbond IDE depends on IDEDMA
2006-11-30 14:39 [PATCH] winbond IDE depends on IDEDMA Olaf Hering
2006-11-30 17:26 ` Bartlomiej Zolnierkiewicz
2006-11-30 18:25 ` Sergei Shtylyov
@ 2006-11-30 18:52 ` Olaf Hering
2006-11-30 19:27 ` Bartlomiej Zolnierkiewicz
2 siblings, 1 reply; 5+ messages in thread
From: Olaf Hering @ 2006-11-30 18:52 UTC (permalink / raw)
To: Andrew Morton, linux-ide
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>
---
drivers/ide/Kconfig | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: linux-2.6/drivers/ide/Kconfig
===================================================================
--- linux-2.6.orig/drivers/ide/Kconfig
+++ linux-2.6/drivers/ide/Kconfig
@@ -389,14 +389,6 @@ config BLK_DEV_RZ1000
Linux. This may slow disk throughput by a few percent, but at least
things will operate 100% reliably.
-config BLK_DEV_SL82C105
- tristate "Winbond SL82c105 support"
- depends on PCI && (PPC || ARM) && BLK_DEV_IDEPCI
- help
- If you have a Winbond SL82c105 IDE controller, say Y here to enable
- special configuration for this chip. This is common on various CHRP
- motherboards, but could be used elsewhere. If in doubt, say Y.
-
config BLK_DEV_IDEDMA_PCI
bool "Generic PCI bus-master DMA support"
depends on PCI && BLK_DEV_IDEPCI
@@ -712,6 +704,14 @@ config BLK_DEV_SIS5513
Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>.
+config BLK_DEV_SL82C105
+ tristate "Winbond SL82c105 support"
+ depends on (PPC || ARM)
+ help
+ If you have a Winbond SL82c105 IDE controller, say Y here to enable
+ special configuration for this chip. This is common on various CHRP
+ motherboards, but could be used elsewhere. If in doubt, say Y.
+
config BLK_DEV_SLC90E66
tristate "SLC90E66 chipset support"
help
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] winbond IDE depends on IDEDMA
2006-11-30 18:52 ` Olaf Hering
@ 2006-11-30 19:27 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 5+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2006-11-30 19:27 UTC (permalink / raw)
To: Olaf Hering; +Cc: Andrew Morton, linux-ide
On 11/30/06, Olaf Hering <olaf@aepfle.de> wrote:
>
> winbond ide depends on idedma.
> Move the option into the IDEDMA section.
Yep, this is better solution.
Andrew, please push upstream.
Bart
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-11-30 19:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-30 14:39 [PATCH] winbond IDE depends on IDEDMA Olaf Hering
2006-11-30 17:26 ` Bartlomiej Zolnierkiewicz
2006-11-30 18:25 ` Sergei Shtylyov
2006-11-30 18:52 ` Olaf Hering
2006-11-30 19:27 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).