git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dvbdev.h
diff --git
a/drivers/media/dvb/dvb-core/dvbdev.h
b/drivers/media/dvb/dvb-core/dvbdev.h
index
895e2ef
..
01fc704
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvbdev.h
+++ b/
drivers/media/dvb/dvb-core/dvbdev.h
@@
-31,10
+31,9
@@
#define DVB_MAJOR 212
#if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0
#define DVB_MAJOR 212
#if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0
-#define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS
+
#define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS
#else
#else
-#warning invalid CONFIG_DVB_MAX_ADAPTERS value
-#define DVB_MAX_ADAPTERS 8
+ #define DVB_MAX_ADAPTERS 8
#endif
#define DVB_UNSET (-1)
#endif
#define DVB_UNSET (-1)