[patch 1/3] git-libata: fix CONFIG_PCI=n build

[patch 1/3] git-libata: fix CONFIG_PCI=n build

[akpm]

From: Andrew Morton <akpm@linux-foundation.org>

sh allmodconfig:

drivers/ata/libata-core.c:127: error: `ata_pci_default_filter' undeclared here (not in a function)
drivers/ata/libata-core.c:127: error: initializer element is not constant
drivers/ata/libata-core.c:127: error: (near initialization for `ata_bmdma_port_ops.mode_filter')

Cc: Tejun Heo <htejun@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ata/libata-core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/ata/libata-core.c~git-libata-fix-config_pci=n-build drivers/ata/libata-core.c
--- a/drivers/ata/libata-core.c~git-libata-fix-config_pci=n-build
+++ a/drivers/ata/libata-core.c
@@ -123,9 +123,9 @@ const struct ata_port_operations ata_sff
 
 const struct ata_port_operations ata_bmdma_port_ops = {
 	.inherits		= &ata_sff_port_ops,
-
+#ifdef CONFIG_PCI
 	.mode_filter		= ata_pci_default_filter,
-
+#endif
 	.bmdma_setup		= ata_bmdma_setup,
 	.bmdma_start		= ata_bmdma_start,
 	.bmdma_stop		= ata_bmdma_stop,
_

Re: [patch 1/3] git-libata: fix CONFIG_PCI=n build

[Tejun Heo]

akpm@linux-foundation.org wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> sh allmodconfig:
> 
> drivers/ata/libata-core.c:127: error: `ata_pci_default_filter' undeclared here (not in a function)
> drivers/ata/libata-core.c:127: error: initializer element is not constant
> drivers/ata/libata-core.c:127: error: (near initialization for `ata_bmdma_port_ops.mode_filter')
> 
> Cc: Tejun Heo <htejun@gmail.com>
> Cc: Jeff Garzik <jeff@garzik.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

There's a pending patch to pull ata_pci_default_filter() out of 
CONFIG_PCI as there's nothing PCI specific about it but this is a 
correct fix.  Jeff, if you're gonna merge the modularize-SFF patchset, 
this one isn't necessary.  If not, please go ahead and merge this.

Thanks.

-- 
tejun