2014-07-04 06:41:01

by Chen Gang

[permalink] [raw]
Subject: [PATCH] arch/score/include/asm/pci.h: Use generic 'pci.h' instead of the original one

Original 'pci.h' is empty, and some modules in allmodconfig may need
contents which can be found in generic 'pci.h', so use generic one
instead of original.

The related error (allmodconfig under score):

CC [M] drivers/scsi/scsi_lib.o
drivers/scsi/scsi_lib.c: In function 'scsi_calculate_bounce_limit':
drivers/scsi/scsi_lib.c:1615:7: error: 'PCI_DMA_BUS_IS_PHYS' undeclared (first use in this function)
if (!PCI_DMA_BUS_IS_PHYS)
^
drivers/scsi/scsi_lib.c:1615:7: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [drivers/scsi/scsi_lib.o] Error 1
make[1]: *** [drivers/scsi] Error 2
make: *** [drivers] Error 2


Signed-off-by: Chen Gang <[email protected]>
---
arch/score/include/asm/Kbuild | 1 +
arch/score/include/asm/pci.h | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
delete mode 100644 arch/score/include/asm/pci.h

diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index aad2091..bfb31569 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -7,6 +7,7 @@ generic-y += clkdev.h
generic-y += cputime.h
generic-y += hash.h
generic-y += mcs_spinlock.h
+generic-y += pci.h
generic-y += preempt.h
generic-y += scatterlist.h
generic-y += trace_clock.h
diff --git a/arch/score/include/asm/pci.h b/arch/score/include/asm/pci.h
deleted file mode 100644
index 3f3cfd8..0000000
--- a/arch/score/include/asm/pci.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_SCORE_PCI_H
-#define _ASM_SCORE_PCI_H
-
-#endif /* _ASM_SCORE_PCI_H */
--
1.9.2.459.g68773ac