diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:25:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:25:08 -0300 |
| commit | c13f70467621e2c352f93b336b382e70ea24d218 (patch) | |
| tree | 582367340fe7529eb3fec3c514ec9d4b2f68ff71 /linux/drivers/media/dvb/dvb-core | |
| parent | a953cf4edb8db13f8b7d20c793696a13ffcd3333 (diff) | |
| parent | 9380e197397e3f8404fa2d2effe5c84b6f56735b (diff) | |
| download | mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.gz mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 3439ccec6..2da27de38 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -56,11 +56,7 @@ static const char * const dnames[] = { #define nums2minor(num,type,id) ((num << 6) | (id << 4) | type) #define MAX_DVB_MINORS (DVB_MAX_ADAPTERS*64) -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) static struct class *dvb_class; -#else -static struct class_simple *dvb_class; -#endif static struct dvb_device* dvbdev_find_device (int minor) { |