projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...
[powerpc.git]
/
drivers
/
media
/
dvb
/
frontends
/
stv0297.h
diff --git
a/drivers/media/dvb/frontends/stv0297.h
b/drivers/media/dvb/frontends/stv0297.h
index
760b80d
..
69f4515
100644
(file)
--- a/
drivers/media/dvb/frontends/stv0297.h
+++ b/
drivers/media/dvb/frontends/stv0297.h
@@
-42,7
+42,7
@@
struct stv0297_config
u8 stop_during_read:1;
};
u8 stop_during_read:1;
};
-#if defined(CONFIG_DVB_STV0297) ||
defined(CONFIG_DVB_STV0297_MODULE
)
+#if defined(CONFIG_DVB_STV0297) ||
(defined(CONFIG_DVB_STV0297_MODULE) && defined(MODULE)
)
extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
struct i2c_adapter* i2c);
#else
extern struct dvb_frontend* stv0297_attach(const struct stv0297_config* config,
struct i2c_adapter* i2c);
#else