diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-03-30 16:00:45 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:57 -0400 |
commit | 8eb8ff3870ede23b2328ef376023a3542efcb9a5 (patch) | |
tree | 4c44c01face036be2d9721e69c3972e996077083 | |
parent | c735372f5df2dc7b67080881bdc613d199173abf (diff) |
V4L/DVB (7483): tuner-simple: fix broken build dependency
tuner-simple is the only module that uses tuner-types - these will be
merged to a single module in the future. For now, build both of them
if TUNER_SIMPLE is selected.
This fixes the following build warning, if tuner-simple is selected
without tuner-types:
WARNING: "tuner_count" [tuner-simple.ko] undefined!
WARNING: "tuners" [tuner-simple.ko] undefined!
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/Kconfig | 5 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index b9b38d9ff650..1f7244cffe2f 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig | |||
@@ -71,13 +71,9 @@ source "drivers/media/dvb/Kconfig" | |||
71 | 71 | ||
72 | source "drivers/media/common/Kconfig" | 72 | source "drivers/media/common/Kconfig" |
73 | 73 | ||
74 | config VIDEO_TUNER_TYPES | ||
75 | tristate | ||
76 | |||
77 | config VIDEO_TUNER | 74 | config VIDEO_TUNER |
78 | tristate | 75 | tristate |
79 | depends on I2C | 76 | depends on I2C |
80 | select VIDEO_TUNER_TYPES | ||
81 | select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE | 77 | select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE |
82 | select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE | 78 | select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE |
83 | select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE | 79 | select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE |
@@ -140,7 +136,6 @@ config TUNER_TEA5767 | |||
140 | config TUNER_SIMPLE | 136 | config TUNER_SIMPLE |
141 | tristate "Simple tuner support" | 137 | tristate "Simple tuner support" |
142 | depends on I2C | 138 | depends on I2C |
143 | select VIDEO_TUNER_TYPES | ||
144 | select TUNER_TDA9887 | 139 | select TUNER_TDA9887 |
145 | default m if VIDEO_TUNER_CUSTOMIZE | 140 | default m if VIDEO_TUNER_CUSTOMIZE |
146 | help | 141 | help |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 77cfaff76420..8b1e97a7caa3 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -84,10 +84,11 @@ obj-$(CONFIG_VIDEO_DPC) += dpc7146.o | |||
84 | obj-$(CONFIG_TUNER_3036) += tuner-3036.o | 84 | obj-$(CONFIG_TUNER_3036) += tuner-3036.o |
85 | 85 | ||
86 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o | 86 | obj-$(CONFIG_VIDEO_TUNER) += tuner.o |
87 | obj-$(CONFIG_VIDEO_TUNER_TYPES) += tuner-types.o | ||
88 | 87 | ||
89 | obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o | 88 | obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o |
90 | obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o | 89 | obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o |
90 | # tuner-types will be merged into tuner-simple, in the future | ||
91 | obj-$(CONFIG_TUNER_SIMPLE) += tuner-types.o | ||
91 | obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o | 92 | obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o |
92 | obj-$(CONFIG_TUNER_TDA8290) += tda8290.o | 93 | obj-$(CONFIG_TUNER_TDA8290) += tda8290.o |
93 | obj-$(CONFIG_TUNER_TEA5767) += tea5767.o | 94 | obj-$(CONFIG_TUNER_TEA5767) += tea5767.o |