diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:43:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:43:21 -0400 |
| commit | 160acc2e899f26356bde92bc257253b7ca78f0c3 (patch) | |
| tree | c60782685ac0fdf4b2d6278c4be639181dd65126 /drivers/base/dmapool.c | |
| parent | a7e1e001f432d5960b929787a2a261cf5a7ddac5 (diff) | |
| parent | c46f2334c84c2b26baa64d42d75ddc5fab38c3dc (diff) | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
[SG] Get rid of __sg_mark_end()
cleanup asm/scatterlist.h includes
SG: Make sg_init_one() use general table init functions
Diffstat (limited to 'drivers/base/dmapool.c')
| -rw-r--r-- | drivers/base/dmapool.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c index 5beddc322e6..b5034dc72a0 100644 --- a/drivers/base/dmapool.c +++ b/drivers/base/dmapool.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #include <linux/device.h> | 2 | #include <linux/device.h> |
| 3 | #include <linux/mm.h> | 3 | #include <linux/mm.h> |
| 4 | #include <asm/io.h> /* Needed for i386 to build */ | 4 | #include <asm/io.h> /* Needed for i386 to build */ |
| 5 | #include <asm/scatterlist.h> /* Needed for i386 to build */ | ||
| 6 | #include <linux/dma-mapping.h> | 5 | #include <linux/dma-mapping.h> |
| 7 | #include <linux/dmapool.h> | 6 | #include <linux/dmapool.h> |
| 8 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |