diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/asm-powerpc/dma.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/asm-powerpc/dma.h')
| -rw-r--r-- | include/asm-powerpc/dma.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/dma.h b/include/asm-powerpc/dma.h index 926378d2cd94..4bb57fe37097 100644 --- a/include/asm-powerpc/dma.h +++ b/include/asm-powerpc/dma.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifndef _ASM_POWERPC_DMA_H | 1 | #ifndef _ASM_POWERPC_DMA_H |
| 2 | #define _ASM_POWERPC_DMA_H | 2 | #define _ASM_POWERPC_DMA_H |
| 3 | #ifdef __KERNEL__ | ||
| 3 | 4 | ||
| 4 | /* | 5 | /* |
| 5 | * Defines for using and allocating dma channels. | 6 | * Defines for using and allocating dma channels. |
| @@ -387,4 +388,5 @@ extern int isa_dma_bridge_buggy; | |||
| 387 | 388 | ||
| 388 | #endif /* !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) */ | 389 | #endif /* !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) */ |
| 389 | 390 | ||
| 391 | #endif /* __KERNEL__ */ | ||
| 390 | #endif /* _ASM_POWERPC_DMA_H */ | 392 | #endif /* _ASM_POWERPC_DMA_H */ |