diff options
Diffstat (limited to 'arch/ppc64/kernel/pci_iommu.c')
-rw-r--r-- | arch/ppc64/kernel/pci_iommu.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/ppc64/kernel/pci_iommu.c b/arch/ppc64/kernel/pci_iommu.c index 2114dc9c59b5..bdf15dbbf4f0 100644 --- a/arch/ppc64/kernel/pci_iommu.c +++ b/arch/ppc64/kernel/pci_iommu.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * arch/ppc64/kernel/pci_iommu.c | 2 | * arch/ppc64/kernel/pci_iommu.c |
3 | * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation | 3 | * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation |
4 | * | 4 | * |
5 | * Rewrite, cleanup, new allocation schemes: | 5 | * Rewrite, cleanup, new allocation schemes: |
6 | * Copyright (C) 2004 Olof Johansson, IBM Corporation | 6 | * Copyright (C) 2004 Olof Johansson, IBM Corporation |
7 | * | 7 | * |
8 | * Dynamic DMA mapping support, platform-independent parts. | 8 | * Dynamic DMA mapping support, platform-independent parts. |
@@ -11,19 +11,18 @@ | |||
11 | * it under the terms of the GNU General Public License as published by | 11 | * it under the terms of the GNU General Public License as published by |
12 | * the Free Software Foundation; either version 2 of the License, or | 12 | * the Free Software Foundation; either version 2 of the License, or |
13 | * (at your option) any later version. | 13 | * (at your option) any later version. |
14 | * | 14 | * |
15 | * This program is distributed in the hope that it will be useful, | 15 | * This program is distributed in the hope that it will be useful, |
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
18 | * GNU General Public License for more details. | 18 | * GNU General Public License for more details. |
19 | * | 19 | * |
20 | * You should have received a copy of the GNU General Public License | 20 | * You should have received a copy of the GNU General Public License |
21 | * along with this program; if not, write to the Free Software | 21 | * along with this program; if not, write to the Free Software |
22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
23 | */ | 23 | */ |
24 | 24 | ||
25 | 25 | ||
26 | #include <linux/config.h> | ||
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
29 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
@@ -39,10 +38,6 @@ | |||
39 | #include <asm/machdep.h> | 38 | #include <asm/machdep.h> |
40 | #include <asm/ppc-pci.h> | 39 | #include <asm/ppc-pci.h> |
41 | 40 | ||
42 | #ifdef CONFIG_PPC_ISERIES | ||
43 | #include <asm/iSeries/iSeries_pci.h> | ||
44 | #endif /* CONFIG_PPC_ISERIES */ | ||
45 | |||
46 | /* | 41 | /* |
47 | * We can use ->sysdata directly and avoid the extra work in | 42 | * We can use ->sysdata directly and avoid the extra work in |
48 | * pci_device_to_OF_node since ->sysdata will have been initialised | 43 | * pci_device_to_OF_node since ->sysdata will have been initialised |