diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-24 12:21:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-24 12:21:43 -0300 |
| commit | 273e7c4cd9ac05feae0d9d31f3c52db75485a378 (patch) | |
| tree | 41f1db31a4d4d1ed6b2aecc72b30a1e6ee732443 /linux | |
| parent | 69401b0f639b2b138b6dc58ba75ef2dcbd9c0db0 (diff) | |
| parent | 45e4554d9f1fe410639bc0dc9a6e9f749446deec (diff) | |
| download | mediapointer-dvb-s2-273e7c4cd9ac05feae0d9d31f3c52db75485a378.tar.gz mediapointer-dvb-s2-273e7c4cd9ac05feae0d9d31f3c52db75485a378.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/pending
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index b2e9c7971..30b7ace57 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -821,8 +821,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, } -static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int -pkt_len) +static void dvb_net_sec(struct net_device *dev, + const u8 *pkt, int pkt_len) { u8 *eth; struct sk_buff *skb; |