git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
pci.h
diff --git
a/arch/ia64/include/asm/pci.h
b/arch/ia64/include/asm/pci.h
index
4adf227
..
73b5f78
100644
(file)
--- a/
arch/ia64/include/asm/pci.h
+++ b/
arch/ia64/include/asm/pci.h
@@
-56,8
+56,6
@@
pcibios_penalize_isa_irq (int irq, int active)
#include <asm-generic/pci-dma-compat.h>
-#include <linux/pci-dma.h>
-
#ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat,