diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-03 13:53:13 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-03 13:53:13 -0800 |
| commit | 66457790914e610bc7f372d47794cee4304ba959 (patch) | |
| tree | 2854a0bb18e778e87a02fabec7b3a46b973bbb35 /linux/drivers/media/video/em28xx | |
| parent | aaac79924970a2c688fa7cf89dc75fc3822460bc (diff) | |
| download | mediapointer-dvb-s2-66457790914e610bc7f372d47794cee4304ba959.tar.gz mediapointer-dvb-s2-66457790914e610bc7f372d47794cee4304ba959.tar.bz2 | |
compat: rename struct delayed_work to work_struct on pre-2.6.20
From: Trent Piepho <xyzzy@speakeasy.org>
In v2.6.19-rc6-118-g52bad64 struct work_struct was changed to be only for
non-delayed work and struct delayed_work was created for delayed work.
Instead of putting ifdefs in the drivers, we use compat.h to rename
delayed_work to work_struct on pre-2.6.20 kernels. This will only be a
problem if some driver decides to create identifiers named both work_struct
and delayed_work in the same scope. There is one driver that has something
named work_struct and none with anything named delayed_work, so I don't
think will be a problem for as long as this compat code sticks around.
Priority: normal
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h index 235b63499..43c537e66 100644 --- a/linux/drivers/media/video/em28xx/em28xx.h +++ b/linux/drivers/media/video/em28xx/em28xx.h @@ -571,11 +571,7 @@ struct em28xx { /* Snapshot button */ char snapshot_button_path[30]; /* path of the input dev */ struct input_dev *sbutton_input_dev; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - struct work_struct sbutton_query_work; -#else struct delayed_work sbutton_query_work; -#endif struct em28xx_dvb *dvb; }; |