This commit broke BF548-EZKIT kernel build...

-Michael 

  CC      drivers/ata/libata-core.o
In file included from
/home/michael/devel/svn/linux-kernel-trunk/arch/blackfin/include/asm/pci
.h:7,
                 from include/linux/pci.h:1002,
                 from drivers/ata/libata-core.c:45:
include/asm-generic/pci-dma-compat.h: In function 'pci_dma_supported':
include/asm-generic/pci-dma-compat.h:15: error: implicit declaration of
function 'dma_supported'
include/asm-generic/pci-dma-compat.h: In function
'pci_dma_sync_sg_for_cpu':
include/asm-generic/pci-dma-compat.h:91: error: implicit declaration of
function 'dma_sync_sg_for_cpu'
include/asm-generic/pci-dma-compat.h: In function
'pci_dma_sync_sg_for_device':
include/asm-generic/pci-dma-compat.h:98: error: implicit declaration of
function 'dma_sync_sg_for_device'
In file included from include/linux/pci.h:1002,
                 from drivers/ata/libata-core.c:45:
/home/michael/devel/svn/linux-kernel-trunk/arch/blackfin/include/asm/pci
.h: At top level:
/home/michael/devel/svn/linux-kernel-trunk/arch/blackfin/include/asm/pci
.h:54: error: redefinition of 'pci_map_single'
include/asm-generic/pci-dma-compat.h:34: error: previous definition of
'pci_map_single' was here
/home/michael/devel/svn/linux-kernel-trunk/arch/blackfin/include/asm/pci
.h:71: error: redefinition of 'pci_unmap_single'
include/asm-generic/pci-dma-compat.h:41: error: previous definition of
'pci_unmap_single' was here
/home/michael/devel/svn/linux-kernel-trunk/arch/blackfin/include/asm/pci
.h:95: error: redefinition of 'pci_map_sg'
include/asm-generic/pci-dma-compat.h:62: error: previous definition of
'pci_map_sg' was here
/home/michael/devel/svn/linux-kernel-trunk/arch/blackfin/include/asm/pci
.h:107: error: redefinition of 'pci_unmap_sg'
include/asm-generic/pci-dma-compat.h:69: error: previous definition of
'pci_unmap_sg' was here
make[2]: *** [drivers/ata/libata-core.o] Error 1




________________________________________
From: [email protected]
[mailto:[email protected]] On Behalf Of
[email protected]
Sent: Thursday, February 05, 2009 9:56 AM
To: [email protected]
Subject: [Linux-kernel-commits] [6064]
trunk/arch/blackfin/include/asm/pci.h: Fix bug when compile some driver
need PCI related API which is not in our arch

Revision
6064
Author
cooloney
Date
2009-02-05 02:56:20 -0600 (Thu, 05 Feb 2009)
Log Message
Fix bug when compile some driver need PCI related API which is not in
our arch

Like this one:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commi
tdiff;h=998aaf01c6f6f3dffc1ea9e7b20b131e38fdbc78

-Bryan
Modified Paths
* trunk/arch/blackfin/include/asm/pci.h
Diff
Modified: trunk/arch/blackfin/include/asm/pci.h (6063 => 6064)

--- trunk/arch/blackfin/include/asm/pci.h       2009-02-05 08:54:43 UTC
(rev 6063)
+++ trunk/arch/blackfin/include/asm/pci.h       2009-02-05 08:56:20 UTC
(rev 6064)
@@ -4,6 +4,7 @@
 #define _ASM_BFIN_PCI_H
 
 #include <asm/scatterlist.h>
+#include <asm-generic/pci-dma-compat.h>
 
 /*
  *

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to