summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:31:13 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:31:13 -0200
commit678c39afdb2904d63f5e55ce708e635c944892ce (patch)
tree07183685b46c23dc23a9334eacce4ebb5d071605 /linux/drivers/media/dvb
parentc239611668a3d8add80d686d266956a8fcac5ca4 (diff)
parentdebafa4c14110eb6c01ab9756953c5f9cd351f05 (diff)
downloadmediapointer-dvb-s2-678c39afdb2904d63f5e55ce708e635c944892ce.tar.gz
mediapointer-dvb-s2-678c39afdb2904d63f5e55ce708e635c944892ce.tar.bz2
merge: http://ifup.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index e2eae4ca7..627096688 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -703,7 +703,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
drop = 1;
/* else: destination address matches the MAC address of our receiver device */
}
- /* else: promiscious mode; pass everything up the stack */
+ /* else: promiscuous mode; pass everything up the stack */
if (drop) {
#ifdef ULE_DEBUG