diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 00:46:21 (GMT) |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 00:46:21 (GMT) |
commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-ppc/ppc4xx_dma.h | |
parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
download | linux-fsl-qoriq-70ac4385a13f78bc478f26d317511893741b05bd.tar.xz |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-ppc/ppc4xx_dma.h')
-rw-r--r-- | include/asm-ppc/ppc4xx_dma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h index 46a086f..935d1e0 100644 --- a/include/asm-ppc/ppc4xx_dma.h +++ b/include/asm-ppc/ppc4xx_dma.h @@ -24,7 +24,6 @@ #ifndef __ASMPPC_PPC4xx_DMA_H #define __ASMPPC_PPC4xx_DMA_H -#include <linux/config.h> #include <linux/types.h> #include <asm/mmu.h> #include <asm/ibm4xx.h> |