diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:21:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-02 06:21:19 -0300 |
| commit | d3cb936980b4090615fdfd74744f7c440aa8be01 (patch) | |
| tree | a51ec31ef236b3a0831871478b995875b2de0c99 /linux/drivers/media/video/cx18 | |
| parent | 659f6de01c8db2a4d84800c14cda9816821a1e11 (diff) | |
| parent | 9f41018ff536a6dd3b8b7907d6b190c7164297a1 (diff) | |
| download | mediapointer-dvb-s2-d3cb936980b4090615fdfd74744f7c440aa8be01.tar.gz mediapointer-dvb-s2-d3cb936980b4090615fdfd74744f7c440aa8be01.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-i2c.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index 26359897d..7bdd2fcdf 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -38,7 +38,6 @@ #include <linux/i2c-algo-bit.h> #include <linux/list.h> #include <linux/unistd.h> -#include <linux/byteorder/swab.h> #include <linux/pagemap.h> #include <linux/workqueue.h> #include <linux/mutex.h> diff --git a/linux/drivers/media/video/cx18/cx18-i2c.c b/linux/drivers/media/video/cx18/cx18-i2c.c index 64a259405..17d04632d 100644 --- a/linux/drivers/media/video/cx18/cx18-i2c.c +++ b/linux/drivers/media/video/cx18/cx18-i2c.c @@ -27,8 +27,6 @@ #include "cx18-av-core.h" #include "cx18-i2c.h" -#include <media/ir-kbd-i2c.h> - #define CX18_REG_I2C_1_WR 0xf15000 #define CX18_REG_I2C_1_RD 0xf15008 #define CX18_REG_I2C_2_WR 0xf25100 |