diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /net/irda/irnet/irnet.h | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'net/irda/irnet/irnet.h')
| -rw-r--r-- | net/irda/irnet/irnet.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index bccf4d0059f0..b001c361ad30 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h | |||
| @@ -241,7 +241,6 @@ | |||
| 241 | #include <linux/module.h> | 241 | #include <linux/module.h> |
| 242 | 242 | ||
| 243 | #include <linux/kernel.h> | 243 | #include <linux/kernel.h> |
| 244 | #include <linux/smp_lock.h> | ||
| 245 | #include <linux/skbuff.h> | 244 | #include <linux/skbuff.h> |
| 246 | #include <linux/tty.h> | 245 | #include <linux/tty.h> |
| 247 | #include <linux/proc_fs.h> | 246 | #include <linux/proc_fs.h> |