diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 23:11:43 +0300 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 23:11:43 +0300 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/atm | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| download | linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/addr.c | 1 | ||||
| -rw-r--r-- | net/atm/lec.c | 1 | ||||
| -rw-r--r-- | net/atm/raw.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/net/atm/addr.c b/net/atm/addr.c index 3060fd0ba4b9..6afa77d63bb5 100644 --- a/net/atm/addr.c +++ b/net/atm/addr.c @@ -4,7 +4,6 @@ #include <linux/atm.h> #include <linux/atmdev.h> -#include <linux/sched.h> #include <asm/uaccess.h> #include "signaling.h" 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, */ #include <linux/types.h> -#include <linux/sched.h> #include <linux/timer.h> #include <asm/param.h> #include <asm/atomic.h> diff --git a/net/atm/raw.c b/net/atm/raw.c index 4df7cdd72aa1..1378f61c5c31 100644 --- a/net/atm/raw.c +++ b/net/atm/raw.c @@ -4,7 +4,6 @@ #include <linux/module.h> -#include <linux/sched.h> #include <linux/atmdev.h> #include <linux/capability.h> #include <linux/kernel.h> |