aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/media/as102/as102_drv.h
diff options
context:
space:
mode:
authorSylwester Nawrocki <snjw23@gmail.com>2011-10-31 12:24:54 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 07:44:05 -0200
commitff7029f5e8fbf682ace0455f6452d840831a3bc2 (patch)
tree66fcb06d0b05e2417a0c57e22a2572062217779a /drivers/staging/media/as102/as102_drv.h
parent8be62e73e5c088fb4a1c928bdaeac1b27d776043 (diff)
[media] staging: as102: Unconditionally compile code dependent on DVB_CORE
The driver depends on DVB_CORE so there is no need for conditional compilation of parts of the code depending on CONFIG_DVB_CORE as the driver is never compiled with CONFIG_DVB_CORE* disabled. Cc: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/as102/as102_drv.h')
-rw-r--r--drivers/staging/media/as102/as102_drv.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
index cd11b1628f4..bcda635b5a9 100644
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -30,11 +30,9 @@ extern struct usb_driver as102_usb_driver;
extern struct spi_driver as102_spi_driver;
#endif
-#if defined(CONFIG_DVB_CORE) || defined(CONFIG_DVB_CORE_MODULE)
#include "dvb_demux.h"
#include "dvb_frontend.h"
#include "dmxdev.h"
-#endif
#define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
#define DRIVER_NAME "as10x_usb"
@@ -112,12 +110,10 @@ struct as102_dev_t {
struct kref kref;
unsigned long minor;
-#if defined(CONFIG_DVB_CORE) || defined(CONFIG_DVB_CORE_MODULE)
struct dvb_adapter dvb_adap;
struct dvb_frontend dvb_fe;
struct dvb_demux dvb_dmx;
struct dmxdev dvb_dmxdev;
-#endif
/* demodulator stats */
struct as10x_demod_stats demod_stats;
@@ -139,9 +135,7 @@ struct as102_dev_t {
int as102_dvb_register(struct as102_dev_t *dev);
void as102_dvb_unregister(struct as102_dev_t *dev);
-#if defined(CONFIG_DVB_CORE) || defined(CONFIG_DVB_CORE_MODULE)
int as102_dvb_register_fe(struct as102_dev_t *dev, struct dvb_frontend *fe);
int as102_dvb_unregister_fe(struct dvb_frontend *dev);
-#endif
/* EOF - vim: set textwidth=80 ts=8 sw=8 sts=8 noet: */