diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:46:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-24 01:46:41 -0300 |
| commit | 34efc2efeab79b43139454c4daeef94ff1b69f2c (patch) | |
| tree | 460b29fd15f88b66bb8412f665c5203cd405e6ef | |
| parent | 005392231f73c7f7781c04eebf5869c0174f503e (diff) | |
| download | mediapointer-dvb-s2-34efc2efeab79b43139454c4daeef94ff1b69f2c.tar.gz mediapointer-dvb-s2-34efc2efeab79b43139454c4daeef94ff1b69f2c.tar.bz2 | |
stv090x.h and stv6110x.h: Fix two trivial compilation breakage errors
From: Mauro Carvalho Chehab <mchehab@redhat.com>
/home/v4l/master/v4l/stv6110x.h:64: error: expected identifier or '(' before '{' token
In file included from /home/v4l/master/v4l/budget.c:52:
/home/v4l/master/v4l/stv090x.h:116: error: redefinition of 'stv090x_attach'
/home/v4l/master/v4l/stv090x.h:108: error: previous definition of 'stv090x_attach' was here
The first pne were due to an extra ';', and the other is due
to a duplicated inline function declaration.
This patch will need to be merged with the one that added those two headers at -git, to avoid
breaking git bisect.
CC: Manu Abraham <abraham.manu@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv090x.h | 8 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv6110x.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv090x.h b/linux/drivers/media/dvb/frontends/stv090x.h index b75a66baf..5a567b3b4 100644 --- a/linux/drivers/media/dvb/frontends/stv090x.h +++ b/linux/drivers/media/dvb/frontends/stv090x.h @@ -109,14 +109,6 @@ static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config *c printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); return NULL; } - -static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config* config, - struct i2c_adapter *i2c, - enum stv090x_demodulator demod) -{ - printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); - return NULL; -} #endif /* CONFIG_DVB_STV090x */ #endif /* __STV090x_H */ diff --git a/linux/drivers/media/dvb/frontends/stv6110x.h b/linux/drivers/media/dvb/frontends/stv6110x.h index 6d43c294e..a38257080 100644 --- a/linux/drivers/media/dvb/frontends/stv6110x.h +++ b/linux/drivers/media/dvb/frontends/stv6110x.h @@ -60,7 +60,7 @@ extern struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, #else static inline struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, const struct stv6110x_config *config, - struct i2c_adapter *i2c); + struct i2c_adapter *i2c) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); return NULL; |