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/ieee1394 | |
| 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/ieee1394')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index d5dfe11aa5c6..b83d254bc86e 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -71,11 +71,11 @@ | |||
| 71 | #include <linux/types.h> | 71 | #include <linux/types.h> |
| 72 | #include <linux/wait.h> | 72 | #include <linux/wait.h> |
| 73 | #include <linux/workqueue.h> | 73 | #include <linux/workqueue.h> |
| 74 | #include <linux/scatterlist.h> | ||
| 74 | 75 | ||
| 75 | #include <asm/byteorder.h> | 76 | #include <asm/byteorder.h> |
| 76 | #include <asm/errno.h> | 77 | #include <asm/errno.h> |
| 77 | #include <asm/param.h> | 78 | #include <asm/param.h> |
| 78 | #include <asm/scatterlist.h> | ||
| 79 | #include <asm/system.h> | 79 | #include <asm/system.h> |
| 80 | #include <asm/types.h> | 80 | #include <asm/types.h> |
| 81 | 81 | ||