projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
media
/
dvb
/
frontends
/
nxt6000.h
diff --git
a/drivers/media/dvb/frontends/nxt6000.h
b/drivers/media/dvb/frontends/nxt6000.h
index
9397393
..
13d2251
100644
(file)
--- a/
drivers/media/dvb/frontends/nxt6000.h
+++ b/
drivers/media/dvb/frontends/nxt6000.h
@@
-33,7
+33,7
@@
struct nxt6000_config
u8 clock_inversion:1;
};
u8 clock_inversion:1;
};
-#if defined(CONFIG_DVB_NXT6000) ||
defined(CONFIG_DVB_NXT6000_MODULE
)
+#if defined(CONFIG_DVB_NXT6000) ||
(defined(CONFIG_DVB_NXT6000_MODULE) && defined(MODULE)
)
extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
struct i2c_adapter* i2c);
#else
extern struct dvb_frontend* nxt6000_attach(const struct nxt6000_config* config,
struct i2c_adapter* i2c);
#else