Commit 34f7373a authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

[PATCH] dvb: remove version.h dependencies 



Remove all #include <linux/version.h> and all references to LINUX_VERSION_CODE
and KERNEL_VERSION.  Based on patch by Olaf Hering.

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a8d995c9

drivers/media/common/saa7146_fops.c

+0 −1
Original line number Diff line number Diff line 
#include <media/saa7146_vv.h>

#include <linux/version.h>



#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)

drivers/media/common/saa7146_i2c.c

+0 −5
Original line number Diff line number Diff line 
#include <linux/version.h>

#include <media/saa7146_vv.h>



static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
@@ -402,12 +401,8 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c 
	saa7146_i2c_reset(dev);



	if( NULL != i2c_adapter ) {

#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))

		i2c_adapter->data = dev;

#else

		BUG_ON(!i2c_adapter->class);

		i2c_set_adapdata(i2c_adapter,dev);

#endif

		i2c_adapter->algo	   = &saa7146_algo;

		i2c_adapter->algo_data     = NULL;

		i2c_adapter->id		   = I2C_HW_SAA7146;

drivers/media/dvb/cinergyT2/cinergyT2.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/config.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/version.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/pci.h>

drivers/media/dvb/dvb-core/dvb_net.c

+0 −5
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
#include <linux/uio.h>

#include <asm/uaccess.h>

#include <linux/crc32.h>

#include <linux/version.h>



#include "dvb_demux.h"

#include "dvb_net.h"
@@ -171,11 +170,7 @@ static unsigned short dvb_net_eth_type_trans(struct sk_buff *skb, 


	skb->mac.raw=skb->data;

	skb_pull(skb,dev->hard_header_len);

#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,8)

	eth = skb->mac.ethernet;

#else

	eth = eth_hdr(skb);

#endif



	if (*eth->h_dest & 1) {

		if(memcmp(eth->h_dest,dev->broadcast, ETH_ALEN)==0)

drivers/media/dvb/frontends/dib3000mb.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include <linux/config.h>

#include <linux/kernel.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>