diff options
| author | Linus Torvalds | 2007-11-03 20:43:21 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-11-03 20:43:21 +0100 |
| commit | 160acc2e899f26356bde92bc257253b7ca78f0c3 (patch) | |
| tree | c60782685ac0fdf4b2d6278c4be639181dd65126 /drivers/net | |
| parent | Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | [SG] Get rid of __sg_mark_end() (diff) | |
| download | kernel-qcow2-linux-160acc2e899f26356bde92bc257253b7ca78f0c3.tar.gz kernel-qcow2-linux-160acc2e899f26356bde92bc257253b7ca78f0c3.tar.xz kernel-qcow2-linux-160acc2e899f26356bde92bc257253b7ca78f0c3.zip | |
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/net')
| -rw-r--r-- | drivers/net/meth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index e25dbab67363..0c89b028a80c 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c @@ -33,7 +33,6 @@ #include <asm/ip32/ip32_ints.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include "meth.h" |