diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/ieee1394/dma.c | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
| download | kernel_samsung_aries-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip kernel_samsung_aries-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.gz kernel_samsung_aries-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.bz2 | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ieee1394/dma.c')
| -rw-r--r-- | drivers/ieee1394/dma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c index ca5167d..c68f328 100644 --- a/drivers/ieee1394/dma.c +++ b/drivers/ieee1394/dma.c @@ -7,10 +7,13 @@ * directory of the kernel sources for details. */ +#include <linux/mm.h> #include <linux/module.h> -#include <linux/vmalloc.h> +#include <linux/pci.h> #include <linux/slab.h> -#include <linux/mm.h> +#include <linux/vmalloc.h> +#include <asm/scatterlist.h> + #include "dma.h" /* dma_prog_region */ |