diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-11-17 12:58:09 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 10:16:49 (GMT) |
| commit | bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22 (patch) | |
| tree | 8192bf86a9249e54fcc9b37da11791ae17ae401f /drivers/media/video/saa7134/saa7134.h | |
| parent | 1697c8dfba72fd182d670a68dca157f64dd3b1f2 (diff) | |
| download | linux-fsl-qoriq-bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22.tar.xz | |
[media] rc: remove ir-common module
Something weird happened with commit 740069e6e043403199dbe2b42256722fb814f6ae.
Instead of dong the right thing, it got somehow corrupted and reverted the
rc changes.
Thanks to David Härdeman for pointing me about the problem.
This patch should be merged with 740069e6e04 before sending upstream.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 4e37b8b..a6c726f 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h @@ -37,7 +37,7 @@ #include <media/v4l2-ioctl.h> #include <media/v4l2-device.h> #include <media/tuner.h> -#include <media/ir-common.h> +#include <media/ir-core.h> #include <media/ir-kbd-i2c.h> #include <media/videobuf-dma-sg.h> #include <sound/core.h> |