diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /net/irda/irnet/irnet.h | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'net/irda/irnet/irnet.h')
| -rw-r--r-- | net/irda/irnet/irnet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index b001c361ad30..bccf4d0059f0 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h | |||
| @@ -241,6 +241,7 @@ | |||
| 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> | ||
| 244 | #include <linux/skbuff.h> | 245 | #include <linux/skbuff.h> |
| 245 | #include <linux/tty.h> | 246 | #include <linux/tty.h> |
| 246 | #include <linux/proc_fs.h> | 247 | #include <linux/proc_fs.h> |