diff options
author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/net/irda/qos.h | |
parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/irda/qos.h')
-rw-r--r-- | include/net/irda/qos.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/irda/qos.h b/include/net/irda/qos.h index 9ae3d6bc2423..cc577dc0a0ef 100644 --- a/include/net/irda/qos.h +++ b/include/net/irda/qos.h | |||
@@ -31,7 +31,6 @@ | |||
31 | #ifndef IRDA_QOS_H | 31 | #ifndef IRDA_QOS_H |
32 | #define IRDA_QOS_H | 32 | #define IRDA_QOS_H |
33 | 33 | ||
34 | #include <linux/config.h> | ||
35 | #include <linux/skbuff.h> | 34 | #include <linux/skbuff.h> |
36 | 35 | ||
37 | #include <net/irda/parameters.h> | 36 | #include <net/irda/parameters.h> |