aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/easycap/easycap.h19
-rw-r--r--drivers/staging/easycap/easycap_ioctl.c1
-rw-r--r--drivers/staging/easycap/easycap_ioctl.h35
-rw-r--r--drivers/staging/easycap/easycap_low.c1
-rw-r--r--drivers/staging/easycap/easycap_low.h32
-rw-r--r--drivers/staging/easycap/easycap_main.c1
-rw-r--r--drivers/staging/easycap/easycap_main.h44
-rw-r--r--drivers/staging/easycap/easycap_settings.c1
-rw-r--r--drivers/staging/easycap/easycap_settings.h35
-rw-r--r--drivers/staging/easycap/easycap_sound.c1
-rw-r--r--drivers/staging/easycap/easycap_sound.h40
-rw-r--r--drivers/staging/easycap/easycap_testcard.c1
-rw-r--r--drivers/staging/easycap/easycap_testcard.h32
13 files changed, 19 insertions, 224 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h
index 337c9bdcfe4..26bb25f7fe7 100644
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/easycap/easycap.h
@@ -727,4 +727,23 @@ extern int easycap_debug;
727} while (0) 727} while (0)
728/*---------------------------------------------------------------------------*/ 728/*---------------------------------------------------------------------------*/
729 729
730/*---------------------------------------------------------------------------*/
731/* globals
732 */
733/*---------------------------------------------------------------------------*/
734
735extern const struct easycap_standard easycap_standard[];
736extern struct easycap_format easycap_format[];
737extern struct v4l2_queryctrl easycap_control[];
738extern struct usb_driver easycap_usb_driver;
739extern struct easycap_dongle easycapdc60_dongle[];
740#if defined(EASYCAP_NEEDS_ALSA)
741extern struct snd_pcm_ops easycap_alsa_ops;
742extern struct snd_pcm_hardware easycap_pcm_hardware;
743extern struct snd_card *psnd_card;
744#else
745extern struct usb_class_driver easyoss_class;
746extern const struct file_operations easyoss_fops;
747#endif /*EASYCAP_NEEDS_ALSA*/
748
730#endif /*EASYCAP_H*/ 749#endif /*EASYCAP_H*/
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c
index 535a62b96e1..bb2ee315c0e 100644
--- a/drivers/staging/easycap/easycap_ioctl.c
+++ b/drivers/staging/easycap/easycap_ioctl.c
@@ -27,7 +27,6 @@
27 27
28#include <linux/smp_lock.h> 28#include <linux/smp_lock.h>
29#include "easycap.h" 29#include "easycap.h"
30#include "easycap_ioctl.h"
31 30
32/*--------------------------------------------------------------------------*/ 31/*--------------------------------------------------------------------------*/
33/* 32/*
diff --git a/drivers/staging/easycap/easycap_ioctl.h b/drivers/staging/easycap/easycap_ioctl.h
deleted file mode 100644
index 245386fd26f..00000000000
--- a/drivers/staging/easycap/easycap_ioctl.h
+++ /dev/null
@@ -1,35 +0,0 @@
1/*****************************************************************************
2* *
3* easycap_ioctl.h *
4* *
5*****************************************************************************/
6/*
7 *
8 * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org>
9 *
10 *
11 * This is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version.
15 *
16 * The software is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this software; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 *
25*/
26/*****************************************************************************/
27#if !defined(EASYCAP_IOCTL_H)
28#define EASYCAP_IOCTL_H
29
30extern struct easycap_dongle easycapdc60_dongle[];
31extern struct easycap_standard easycap_standard[];
32extern struct easycap_format easycap_format[];
33extern struct v4l2_queryctrl easycap_control[];
34
35#endif /*EASYCAP_IOCTL_H*/
diff --git a/drivers/staging/easycap/easycap_low.c b/drivers/staging/easycap/easycap_low.c
index ca48654573d..6ab335a1e6d 100644
--- a/drivers/staging/easycap/easycap_low.c
+++ b/drivers/staging/easycap/easycap_low.c
@@ -39,7 +39,6 @@
39/****************************************************************************/ 39/****************************************************************************/
40 40
41#include "easycap.h" 41#include "easycap.h"
42#include "easycap_low.h"
43 42
44/*--------------------------------------------------------------------------*/ 43/*--------------------------------------------------------------------------*/
45static const struct stk1160config { 44static const struct stk1160config {
diff --git a/drivers/staging/easycap/easycap_low.h b/drivers/staging/easycap/easycap_low.h
deleted file mode 100644
index 7f3b393dca6..00000000000
--- a/drivers/staging/easycap/easycap_low.h
+++ /dev/null
@@ -1,32 +0,0 @@
1/*****************************************************************************
2* *
3* easycap_low.h *
4* *
5*****************************************************************************/
6/*
7 *
8 * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org>
9 *
10 *
11 * This is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version.
15 *
16 * The software is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this software; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 *
25*/
26/*****************************************************************************/
27#if !defined(EASYCAP_LOW_H)
28#define EASYCAP_LOW_H
29
30extern struct easycap_dongle easycapdc60_dongle[];
31
32#endif /*EASYCAP_LOW_H*/
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index a13418125ef..b15493e9da9 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/drivers/staging/easycap/easycap_main.c
@@ -29,7 +29,6 @@
29/*****************************************************************************/ 29/*****************************************************************************/
30 30
31#include "easycap.h" 31#include "easycap.h"
32#include "easycap_main.h"
33 32
34int easycap_debug; 33int easycap_debug;
35static int easycap_bars = 1; 34static int easycap_bars = 1;
diff --git a/drivers/staging/easycap/easycap_main.h b/drivers/staging/easycap/easycap_main.h
deleted file mode 100644
index 4c8577c92e4..00000000000
--- a/drivers/staging/easycap/easycap_main.h
+++ /dev/null
@@ -1,44 +0,0 @@
1/*****************************************************************************
2* *
3* easycap_main.h *
4* *
5*****************************************************************************/
6/*
7 *
8 * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org>
9 *
10 *
11 * This is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version.
15 *
16 * The software is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this software; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 *
25*/
26/*****************************************************************************/
27#if !defined(EASYCAP_MAIN_H)
28#define EASYCAP_MAIN_H
29
30extern struct easycap_standard easycap_standard[];
31extern struct easycap_format easycap_format[];
32extern struct v4l2_queryctrl easycap_control[];
33extern struct usb_driver easycap_usb_driver;
34extern struct easycap_dongle easycapdc60_dongle[];
35#if defined(EASYCAP_NEEDS_ALSA)
36extern struct snd_pcm_ops easycap_alsa_ops;
37extern struct snd_pcm_hardware easycap_pcm_hardware;
38extern struct snd_card *psnd_card;
39#else
40extern struct usb_class_driver easyoss_class;
41extern const struct file_operations easyoss_fops;
42#endif /*EASYCAP_NEEDS_ALSA*/
43
44#endif /*EASYCAP_MAIN_H*/
diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/easycap/easycap_settings.c
index 3a5295738c1..6ae1a73099f 100644
--- a/drivers/staging/easycap/easycap_settings.c
+++ b/drivers/staging/easycap/easycap_settings.c
@@ -26,7 +26,6 @@
26/*****************************************************************************/ 26/*****************************************************************************/
27 27
28#include "easycap.h" 28#include "easycap.h"
29#include "easycap_settings.h"
30 29
31/*---------------------------------------------------------------------------*/ 30/*---------------------------------------------------------------------------*/
32/* 31/*
diff --git a/drivers/staging/easycap/easycap_settings.h b/drivers/staging/easycap/easycap_settings.h
deleted file mode 100644
index fa13f5831f5..00000000000
--- a/drivers/staging/easycap/easycap_settings.h
+++ /dev/null
@@ -1,35 +0,0 @@
1/*****************************************************************************
2* *
3* easycap_settings.h *
4* *
5*****************************************************************************/
6/*
7 *
8 * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org>
9 *
10 *
11 * This is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version.
15 *
16 * The software is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this software; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 *
25*/
26/*****************************************************************************/
27#if !defined(EASYCAP_SETTINGS_H)
28#define EASYCAP_SETTINGS_H
29
30extern const struct easycap_standard easycap_standard[];
31extern struct v4l2_queryctrl easycap_control[];
32extern struct easycap_format easycap_format[];
33extern struct easycap_dongle easycapdc60_dongle[];
34
35#endif /*EASYCAP_SETTINGS_H*/
diff --git a/drivers/staging/easycap/easycap_sound.c b/drivers/staging/easycap/easycap_sound.c
index 4bfaf06fb32..d539e2886a2 100644
--- a/drivers/staging/easycap/easycap_sound.c
+++ b/drivers/staging/easycap/easycap_sound.c
@@ -29,7 +29,6 @@
29/*****************************************************************************/ 29/*****************************************************************************/
30 30
31#include "easycap.h" 31#include "easycap.h"
32#include "easycap_sound.h"
33 32
34#if defined(EASYCAP_NEEDS_ALSA) 33#if defined(EASYCAP_NEEDS_ALSA)
35/*--------------------------------------------------------------------------*/ 34/*--------------------------------------------------------------------------*/
diff --git a/drivers/staging/easycap/easycap_sound.h b/drivers/staging/easycap/easycap_sound.h
deleted file mode 100644
index ffcd6f203cc..00000000000
--- a/drivers/staging/easycap/easycap_sound.h
+++ /dev/null
@@ -1,40 +0,0 @@
1/*****************************************************************************
2* *
3* easycap_sound.h *
4* *
5*****************************************************************************/
6/*
7 *
8 * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org>
9 *
10 *
11 * This is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version.
15 *
16 * The software is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this software; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 *
25*/
26/*****************************************************************************/
27#if !defined(EASYCAP_SOUND_H)
28#define EASYCAP_SOUND_H
29
30extern struct easycap_dongle easycapdc60_dongle[];
31extern struct easycap *peasycap;
32extern struct usb_driver easycap_usb_driver;
33#if defined(EASYCAP_NEEDS_ALSA)
34extern struct snd_pcm_hardware easycap_pcm_hardware;
35#else
36extern struct usb_class_driver easyoss_class;
37extern const struct file_operations easyoss_fops;
38#endif /*EASYCAP_NEEDS_ALSA*/
39
40#endif /*EASYCAP_SOUND_H*/
diff --git a/drivers/staging/easycap/easycap_testcard.c b/drivers/staging/easycap/easycap_testcard.c
index 1089603f249..0f8336b6510 100644
--- a/drivers/staging/easycap/easycap_testcard.c
+++ b/drivers/staging/easycap/easycap_testcard.c
@@ -26,7 +26,6 @@
26/*****************************************************************************/ 26/*****************************************************************************/
27 27
28#include "easycap.h" 28#include "easycap.h"
29#include "easycap_testcard.h"
30 29
31/*****************************************************************************/ 30/*****************************************************************************/
32#define TESTCARD_BYTESPERLINE (2 * 720) 31#define TESTCARD_BYTESPERLINE (2 * 720)
diff --git a/drivers/staging/easycap/easycap_testcard.h b/drivers/staging/easycap/easycap_testcard.h
deleted file mode 100644
index 2a21e7cfd8a..00000000000
--- a/drivers/staging/easycap/easycap_testcard.h
+++ /dev/null
@@ -1,32 +0,0 @@
1/*****************************************************************************
2* *
3* easycap_testcard.h *
4* *
5*****************************************************************************/
6/*
7 *
8 * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org>
9 *
10 *
11 * This is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version.
15 *
16 * The software is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU General Public License
22 * along with this software; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 *
25*/
26/*****************************************************************************/
27#if !defined(EASYCAP_TESTCARD_H)
28#define EASYCAP_TESTCARD_H
29
30extern struct easycap_dongle easycapdc60_dongle[];
31
32#endif /*EASYCAP_TESTCARD_H*/
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 15:59:09 -0400