Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
591a0d35
Commit
591a0d35
authored
Feb 08, 2010
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
V4L/DVB: tm6000: Allow tm6000 driver compilation
Signed-off-by:
Mauro Carvalho Chehab
<
mchehab@redhat.com
>
parent
caa0d36c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
8 deletions
+6
-8
drivers/staging/Kconfig
drivers/staging/Kconfig
+2
-0
drivers/staging/Makefile
drivers/staging/Makefile
+1
-0
drivers/staging/tm6000/Makefile
drivers/staging/tm6000/Makefile
+3
-0
drivers/staging/tm6000/tm6000-core.c
drivers/staging/tm6000/tm6000-core.c
+0
-1
drivers/staging/tm6000/tm6000-dvb.c
drivers/staging/tm6000/tm6000-dvb.c
+0
-7
No files found.
drivers/staging/Kconfig
View file @
591a0d35
...
@@ -49,6 +49,8 @@ source "drivers/staging/go7007/Kconfig"
...
@@ -49,6 +49,8 @@ source "drivers/staging/go7007/Kconfig"
source "drivers/staging/cx25821/Kconfig"
source "drivers/staging/cx25821/Kconfig"
source "drivers/staging/tm6000/Kconfig"
source "drivers/staging/usbip/Kconfig"
source "drivers/staging/usbip/Kconfig"
source "drivers/staging/winbond/Kconfig"
source "drivers/staging/winbond/Kconfig"
...
...
drivers/staging/Makefile
View file @
591a0d35
...
@@ -7,6 +7,7 @@ obj-$(CONFIG_ET131X) += et131x/
...
@@ -7,6 +7,7 @@ obj-$(CONFIG_ET131X) += et131x/
obj-$(CONFIG_SLICOSS)
+=
slicoss/
obj-$(CONFIG_SLICOSS)
+=
slicoss/
obj-$(CONFIG_VIDEO_GO7007)
+=
go7007/
obj-$(CONFIG_VIDEO_GO7007)
+=
go7007/
obj-$(CONFIG_VIDEO_CX25821)
+=
cx25821/
obj-$(CONFIG_VIDEO_CX25821)
+=
cx25821/
obj-$(CONFIG_VIDEO_TM6000)
+=
tm6000/
obj-$(CONFIG_USB_IP_COMMON)
+=
usbip/
obj-$(CONFIG_USB_IP_COMMON)
+=
usbip/
obj-$(CONFIG_W35UND)
+=
winbond/
obj-$(CONFIG_W35UND)
+=
winbond/
obj-$(CONFIG_PRISM2_USB)
+=
wlan-ng/
obj-$(CONFIG_PRISM2_USB)
+=
wlan-ng/
...
...
drivers/staging/tm6000/Makefile
View file @
591a0d35
...
@@ -13,3 +13,6 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
...
@@ -13,3 +13,6 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
obj-$(CONFIG_VIDEO_TM6000_ALSA)
+=
tm6000-alsa.o
obj-$(CONFIG_VIDEO_TM6000_ALSA)
+=
tm6000-alsa.o
EXTRA_CFLAGS
=
-Idrivers
/media/video
EXTRA_CFLAGS
=
-Idrivers
/media/video
EXTRA_CFLAGS
+=
-Idrivers
/media/common/tuners
EXTRA_CFLAGS
+=
-Idrivers
/media/dvb/dvb-core
EXTRA_CFLAGS
+=
-Idrivers
/media/dvb/frontends
drivers/staging/tm6000/tm6000-core.c
View file @
591a0d35
...
@@ -24,7 +24,6 @@
...
@@ -24,7 +24,6 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/usb.h>
#include <linux/i2c.h>
#include <linux/i2c.h>
#include <linux/video_decoder.h>
#include "tm6000.h"
#include "tm6000.h"
#include "tm6000-regs.h"
#include "tm6000-regs.h"
#include <media/v4l2-common.h>
#include <media/v4l2-common.h>
...
...
drivers/staging/tm6000/tm6000-dvb.c
View file @
591a0d35
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/usb.h>
#include <linux/usb.h>
#include <compat.h>
#include "tm6000.h"
#include "tm6000.h"
#include "tm6000-regs.h"
#include "tm6000-regs.h"
...
@@ -72,12 +71,7 @@ static void inline print_err_status (struct tm6000_core *dev,
...
@@ -72,12 +71,7 @@ static void inline print_err_status (struct tm6000_core *dev,
}
}
}
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
static
void
tm6000_urb_received
(
struct
urb
*
urb
,
struct
pt_regs
*
ptregs
)
#else
static
void
tm6000_urb_received
(
struct
urb
*
urb
)
static
void
tm6000_urb_received
(
struct
urb
*
urb
)
#endif
{
{
int
ret
;
int
ret
;
struct
tm6000_core
*
dev
=
urb
->
context
;
struct
tm6000_core
*
dev
=
urb
->
context
;
...
@@ -226,7 +220,6 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev)
...
@@ -226,7 +220,6 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev)
.
parallel_ts
=
1
,
.
parallel_ts
=
1
,
.
if2
=
45700
,
.
if2
=
45700
,
.
disable_i2c_gate_ctrl
=
1
,
.
disable_i2c_gate_ctrl
=
1
,
.
tm6000
=
1
,
};
};
dvb
->
frontend
=
pseudo_zl10353_attach
(
dev
,
&
config
,
dvb
->
frontend
=
pseudo_zl10353_attach
(
dev
,
&
config
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment