diff options
| author |   Mike Travis <travis@sgi.com> | 2008-12-31 17:34:16 -0800 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-01-03 18:53:31 +0100 |
| commit | 7eb19553369c46cc1fa64caf120cbcab1b597f7c (patch) | |
| tree | ef1a3beae706b9497c845d0a2557ceb4d2754998 /drivers/media/video/cx25840/cx25840-core.h | |
| parent | x86: mark get_cpu_leaves() with __cpuinit annotation (diff) | |
| parent | cpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS (diff) | |
| download | linux-dev-7eb19553369c46cc1fa64caf120cbcab1b597f7c.tar.xz linux-dev-7eb19553369c46cc1fa64caf120cbcab1b597f7c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts:
arch/x86/kernel/io_apic.c
kernel/rcuclassic.c
kernel/sched.c
kernel/time/tick-sched.c
Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-core.h')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.h b/drivers/media/video/cx25840/cx25840-core.h index b87337e590b4..be0558277ca3 100644 --- a/drivers/media/video/cx25840/cx25840-core.h +++ b/drivers/media/video/cx25840/cx25840-core.h @@ -22,6 +22,7 @@ #include <linux/videodev2.h> +#include <media/v4l2-device.h> #include <linux/i2c.h> /* ENABLE_PVR150_WORKAROUND activates a workaround for a hardware bug that is @@ -34,6 +35,7 @@ struct cx25840_state { struct i2c_client *c; + struct v4l2_subdev sd; int pvr150_workaround; int radio; v4l2_std_id std; @@ -53,6 +55,11 @@ struct cx25840_state { struct work_struct fw_work; /* work entry for fw load */ }; +static inline struct cx25840_state *to_state(struct v4l2_subdev *sd) +{ + return container_of(sd, struct cx25840_state, sd); +} + /* ----------------------------------------------------------------------- */ /* cx25850-core.c */ int cx25840_write(struct i2c_client *client, u16 addr, u8 value); |