aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/gspca.h
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-03-30 13:32:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:30 -0400
commitf76280154cdbb0ad02d5402972d1eb85f9e2898a (patch)
treeb606ddd799bad2c91170ab2626442d299b8c2520 /drivers/media/video/gspca/gspca.h
parentb400f09246247e2c55b116bd7b71da4fb0cb19dc (diff)
V4L/DVB: [-next] gspca: fix build for INPUT=m or INPUT=n
Handle case of GSPCA=m, INPUT=m when building gspca core; also handle case of INPUT=n by using stubs. drivers/media/video/gspca/gspca.c:662: error: implicit declaration of function 'gspca_input_destroy_urb' drivers/media/video/gspca/gspca.c:668: error: implicit declaration of function 'gspca_input_create_urb' drivers/media/video/gspca/gspca.c:2284: error: implicit declaration of function 'gspca_input_connect' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/gspca.h')
-rw-r--r--drivers/media/video/gspca/gspca.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 8bb242fb79de..8b963dfae861 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -130,7 +130,7 @@ struct sd_desc {
130 cam_reg_op get_register; 130 cam_reg_op get_register;
131#endif 131#endif
132 cam_ident_op get_chip_ident; 132 cam_ident_op get_chip_ident;
133#ifdef CONFIG_INPUT 133#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
134 cam_int_pkt_op int_pkt_scan; 134 cam_int_pkt_op int_pkt_scan;
135 /* other_input makes the gspca core create gspca_dev->input even when 135 /* other_input makes the gspca core create gspca_dev->input even when
136 int_pkt_scan is NULL, for cams with non interrupt driven buttons */ 136 int_pkt_scan is NULL, for cams with non interrupt driven buttons */
@@ -158,7 +158,7 @@ struct gspca_dev {
158 struct module *module; /* subdriver handling the device */ 158 struct module *module; /* subdriver handling the device */
159 struct usb_device *dev; 159 struct usb_device *dev;
160 struct file *capt_file; /* file doing video capture */ 160 struct file *capt_file; /* file doing video capture */
161#ifdef CONFIG_INPUT 161#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
162 struct input_dev *input_dev; 162 struct input_dev *input_dev;
163 char phys[64]; /* physical device path */ 163 char phys[64]; /* physical device path */
164#endif 164#endif
@@ -171,7 +171,7 @@ struct gspca_dev {
171#define USB_BUF_SZ 64 171#define USB_BUF_SZ 64
172 __u8 *usb_buf; /* buffer for USB exchanges */ 172 __u8 *usb_buf; /* buffer for USB exchanges */
173 struct urb *urb[MAX_NURBS]; 173 struct urb *urb[MAX_NURBS];
174#ifdef CONFIG_INPUT 174#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
175 struct urb *int_urb; 175 struct urb *int_urb;
176#endif 176#endif
177 177