diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/atm/lec.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/atm/lec.c')
| -rw-r--r-- | net/atm/lec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index 986945527691..3d804d61f656 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
| @@ -1437,7 +1437,6 @@ static void lane2_associate_ind(struct net_device *dev, u8 *mac_addr, | |||
| 1437 | */ | 1437 | */ |
| 1438 | 1438 | ||
| 1439 | #include <linux/types.h> | 1439 | #include <linux/types.h> |
| 1440 | #include <linux/sched.h> | ||
| 1441 | #include <linux/timer.h> | 1440 | #include <linux/timer.h> |
| 1442 | #include <asm/param.h> | 1441 | #include <asm/param.h> |
| 1443 | #include <asm/atomic.h> | 1442 | #include <asm/atomic.h> |