aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 20:39:59 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 20:39:59 -0700
commitd7fff6f4d1ed1bc31577df887fefcb1541923367 (patch)
treee2f37519c57efe20f47dc1df694af28d537f67b2 /include
parent6df8cd3d4f921762504c4d1e7ed702b745702543 (diff)
parente51f802babc5e368c60fbfd08c6c11269c9253b0 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Add missing entries to family name tables [NET]: Make NETDEVICES depend on NET. [IPV6]: endianness bug in ip6_tunnel [IrDA]: TOSHIBA_FIR depends on virt_to_bus [IrDA]: EP7211 IR driver port to the latest SIR API [IrDA] Typo fix in irnetlink.c copyright [NET]: Fix loopback crashes when multiqueue is enabled. [IPV4]: Fix inetpeer gcc-4.2 warnings
Diffstat (limited to 'include')
-rw-r--r--include/linux/irda.h1
-rw-r--r--include/linux/netdevice.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/irda.h b/include/linux/irda.h
index 8e3735714c1..28f88ecba34 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -77,6 +77,7 @@ typedef enum {
IRDA_ACT200L_DONGLE = 10,
IRDA_MA600_DONGLE = 11,
IRDA_TOIM3232_DONGLE = 12,
+ IRDA_EP7211_DONGLE = 13,
} IRDA_DONGLE;
/* Protocol types to be used for SOCK_DGRAM */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9820ca1e45e..4a616d73cc2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -575,7 +575,7 @@ struct net_device
/* The TX queue control structures */
unsigned int egress_subqueue_count;
- struct net_device_subqueue egress_subqueue[0];
+ struct net_device_subqueue egress_subqueue[1];
};
#define to_net_dev(d) container_of(d, struct net_device, dev)