diff options
author | Peter Beutner <p.beutner@gmx.net> | 2006-01-09 15:32:43 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-09 15:32:43 -0200 |
commit | 400b7083fbcc8e7a1157a82aa126977179873268 (patch) | |
tree | 67669ca5f0e0ddd6858cf0c7c5b485ec7554ca40 /drivers/media/dvb/dvb-core/dvb_net.c | |
parent | d8e6acf2ec120f3dc7929581d87b5b8b3ff21627 (diff) | |
download | kernel_samsung_smdk4412-400b7083fbcc8e7a1157a82aa126977179873268.zip kernel_samsung_smdk4412-400b7083fbcc8e7a1157a82aa126977179873268.tar.gz kernel_samsung_smdk4412-400b7083fbcc8e7a1157a82aa126977179873268.tar.bz2 |
V4L/DVB (3194): Revert one 64-bit fix and improved other 64-bit fixes
- Reverted objectionable fix in saa7146_hlp.c
- Merged in improved dvb 64-bit fixes from Peter Beutner.
Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/dvb/dvb-core/dvb_net.c')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index 95d991f..6711eb6 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c @@ -1222,7 +1222,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype) return if_num; } -static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num) +static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned long num) { struct net_device *net = dvbnet->device[num]; struct dvb_net_priv *priv; |