aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/firewire/firedtv.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-02-05 08:07:39 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:12 -0400
commite68044e2351ee937997c1e014fbbbe1c97b935cf (patch)
treec724115a2c4621d4d29e6c2b9a51c887ad2d12f5 /drivers/media/dvb/firewire/firedtv.h
parent7ee40aadabd59b6cab60835f0ef9cdbe385df438 (diff)
[media] firedtv: remove obsolete ieee1394 backend code
drivers/ieee1394/ has been removed in Linux 2.6.37. The corresponding backend code in firedtv is no longer built in now and can be deleted. Firedtv continues to work with drivers/firewire/. Also, fix a Kconfig menu comment: Removal of CONFIG_IEEE1394 made the "Supported FireWire (IEEE 1394) Adapters" comment disappear; bring it back with corrected dependency. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Reviewed-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv.h')
-rw-r--r--drivers/media/dvb/firewire/firedtv.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/dvb/firewire/firedtv.h b/drivers/media/dvb/firewire/firedtv.h
index 78cc28f36914..4a87049c9132 100644
--- a/drivers/media/dvb/firewire/firedtv.h
+++ b/drivers/media/dvb/firewire/firedtv.h
@@ -118,15 +118,6 @@ struct firedtv {
118 u8 avc_data[512]; 118 u8 avc_data[512];
119}; 119};
120 120
121/* firedtv-1394.c */
122#ifdef CONFIG_DVB_FIREDTV_IEEE1394
123int fdtv_1394_init(void);
124void fdtv_1394_exit(void);
125#else
126static inline int fdtv_1394_init(void) { return 0; }
127static inline void fdtv_1394_exit(void) {}
128#endif
129
130/* firedtv-avc.c */ 121/* firedtv-avc.c */
131int avc_recv(struct firedtv *fdtv, void *data, size_t length); 122int avc_recv(struct firedtv *fdtv, void *data, size_t length);
132int avc_tuner_status(struct firedtv *fdtv, struct firedtv_tuner_status *stat); 123int avc_tuner_status(struct firedtv *fdtv, struct firedtv_tuner_status *stat);
@@ -170,13 +161,8 @@ extern const struct ieee1394_device_id fdtv_id_table[];
170void fdtv_frontend_init(struct firedtv *fdtv); 161void fdtv_frontend_init(struct firedtv *fdtv);
171 162
172/* firedtv-fw.c */ 163/* firedtv-fw.c */
173#ifdef CONFIG_DVB_FIREDTV_FIREWIRE
174int fdtv_fw_init(void); 164int fdtv_fw_init(void);
175void fdtv_fw_exit(void); 165void fdtv_fw_exit(void);
176#else
177static inline int fdtv_fw_init(void) { return 0; }
178static inline void fdtv_fw_exit(void) {}
179#endif
180 166
181/* firedtv-rc.c */ 167/* firedtv-rc.c */
182#ifdef CONFIG_DVB_FIREDTV_INPUT 168#ifdef CONFIG_DVB_FIREDTV_INPUT