aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-isa.h
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-03-22 13:53:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-10 18:52:16 -0400
commit865d7ec93433a3c9d8d2c2372e582853f52a7327 (patch)
treed4f89b62ded8ea7c06492addf5a0dfbd45f3e54a /drivers/media/radio/radio-isa.h
parent8766e86535c9c9d46621f285b85266b2975348c2 (diff)
[media] radio-isa: PnP support for the new ISA radio framework
Add PnP support to the new ISA radio framework. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/radio/radio-isa.h')
-rw-r--r--drivers/media/radio/radio-isa.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-isa.h b/drivers/media/radio/radio-isa.h
index 8a0ea84d86d..ba4c01f1bd0 100644
--- a/drivers/media/radio/radio-isa.h
+++ b/drivers/media/radio/radio-isa.h
@@ -24,6 +24,7 @@
24#define _RADIO_ISA_H_ 24#define _RADIO_ISA_H_
25 25
26#include <linux/isa.h> 26#include <linux/isa.h>
27#include <linux/pnp.h>
27#include <linux/videodev2.h> 28#include <linux/videodev2.h>
28#include <media/v4l2-device.h> 29#include <media/v4l2-device.h>
29#include <media/v4l2-ctrls.h> 30#include <media/v4l2-ctrls.h>
@@ -76,6 +77,9 @@ struct radio_isa_ops {
76/* Top level structure needed to instantiate the cards */ 77/* Top level structure needed to instantiate the cards */
77struct radio_isa_driver { 78struct radio_isa_driver {
78 struct isa_driver driver; 79 struct isa_driver driver;
80#ifdef CONFIG_PNP
81 struct pnp_driver pnp_driver;
82#endif
79 const struct radio_isa_ops *ops; 83 const struct radio_isa_ops *ops;
80 /* The module_param_array with the specified I/O ports */ 84 /* The module_param_array with the specified I/O ports */
81 int *io_params; 85 int *io_params;
@@ -101,5 +105,10 @@ struct radio_isa_driver {
101int radio_isa_match(struct device *pdev, unsigned int dev); 105int radio_isa_match(struct device *pdev, unsigned int dev);
102int radio_isa_probe(struct device *pdev, unsigned int dev); 106int radio_isa_probe(struct device *pdev, unsigned int dev);
103int radio_isa_remove(struct device *pdev, unsigned int dev); 107int radio_isa_remove(struct device *pdev, unsigned int dev);
108#ifdef CONFIG_PNP
109int radio_isa_pnp_probe(struct pnp_dev *dev,
110 const struct pnp_device_id *dev_id);
111void radio_isa_pnp_remove(struct pnp_dev *dev);
112#endif
104 113
105#endif 114#endif