diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 01:36:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 01:36:37 +0100 |
| commit | 6a8c62f3e97fdf184fde60bc99155476e8e9cd55 (patch) | |
| tree | 71b818d584f79baf1a192df65c758a592a63360d /drivers/media/platform/s5p-tv/mixer.h | |
| parent | init.h: add missing initcall variants (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.tar.xz linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.zip | |
Merge 3.13-rc4 into tty-next
We want the fixes in here as well.
Diffstat (limited to 'drivers/media/platform/s5p-tv/mixer.h')
| -rw-r--r-- | drivers/media/platform/s5p-tv/mixer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h index 04e6490a45be..fb2acc53112a 100644 --- a/drivers/media/platform/s5p-tv/mixer.h +++ b/drivers/media/platform/s5p-tv/mixer.h @@ -65,7 +65,7 @@ struct mxr_format { int num_subframes; /** specifies to which subframe belong given plane */ int plane2subframe[MXR_MAX_PLANES]; - /** internal code, driver dependant */ + /** internal code, driver dependent */ unsigned long cookie; }; |