diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/ppc-pci.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/ppc-pci.h')
| -rw-r--r-- | include/asm-powerpc/ppc-pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h index 36cdc869e580..bdef312900a1 100644 --- a/include/asm-powerpc/ppc-pci.h +++ b/include/asm-powerpc/ppc-pci.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | #ifndef _ASM_POWERPC_PPC_PCI_H | 9 | #ifndef _ASM_POWERPC_PPC_PCI_H |
| 10 | #define _ASM_POWERPC_PPC_PCI_H | 10 | #define _ASM_POWERPC_PPC_PCI_H |
| 11 | #ifdef __KERNEL__ | ||
| 11 | 12 | ||
| 12 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 13 | #include <asm/pci-bridge.h> | 14 | #include <asm/pci-bridge.h> |
| @@ -93,4 +94,5 @@ void eeh_clear_slot (struct device_node *dn, int mode_flag); | |||
| 93 | 94 | ||
| 94 | #endif | 95 | #endif |
| 95 | 96 | ||
| 97 | #endif /* __KERNEL__ */ | ||
| 96 | #endif /* _ASM_POWERPC_PPC_PCI_H */ | 98 | #endif /* _ASM_POWERPC_PPC_PCI_H */ |