diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-26 18:28:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-26 18:28:55 -0300 |
| commit | b98fedbf223090872b1b4b7ec8e89994b55fb9bb (patch) | |
| tree | ed2c0aa6bd8697123815b41844f993c01cb85ba4 | |
| parent | 1af587a5d42154a22a337a6e0d478835d12ac302 (diff) | |
| download | mediapointer-dvb-s2-b98fedbf223090872b1b4b7ec8e89994b55fb9bb.tar.gz mediapointer-dvb-s2-b98fedbf223090872b1b4b7ec8e89994b55fb9bb.tar.bz2 | |
Fix a merge trouble
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Unfortunately, mailimport added the new files at the wrong place. Fix it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/Documentation/video4linux/si4713.txt (renamed from linux/linux/Documentation/video4linux/si4713.txt) | 0 | ||||
| -rw-r--r-- | linux/drivers/media/radio/radio-si4713.c (renamed from linux/linux/drivers/media/radio/radio-si4713.c) | 0 | ||||
| -rw-r--r-- | linux/drivers/media/radio/si4713-i2c.c (renamed from linux/linux/drivers/media/radio/si4713-i2c.c) | 0 | ||||
| -rw-r--r-- | linux/drivers/media/radio/si4713-i2c.h (renamed from linux/linux/drivers/media/radio/si4713-i2c.h) | 0 | ||||
| -rw-r--r-- | linux/include/media/radio-si4713.h (renamed from linux/linux/include/media/radio-si4713.h) | 0 | ||||
| -rw-r--r-- | linux/include/media/si4713.h (renamed from linux/linux/include/media/si4713.h) | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/linux/linux/Documentation/video4linux/si4713.txt b/linux/Documentation/video4linux/si4713.txt index 25abdb782..25abdb782 100644 --- a/linux/linux/Documentation/video4linux/si4713.txt +++ b/linux/Documentation/video4linux/si4713.txt diff --git a/linux/linux/drivers/media/radio/radio-si4713.c b/linux/drivers/media/radio/radio-si4713.c index 65c14b704..65c14b704 100644 --- a/linux/linux/drivers/media/radio/radio-si4713.c +++ b/linux/drivers/media/radio/radio-si4713.c diff --git a/linux/linux/drivers/media/radio/si4713-i2c.c b/linux/drivers/media/radio/si4713-i2c.c index 8cbbe48b0..8cbbe48b0 100644 --- a/linux/linux/drivers/media/radio/si4713-i2c.c +++ b/linux/drivers/media/radio/si4713-i2c.c diff --git a/linux/linux/drivers/media/radio/si4713-i2c.h b/linux/drivers/media/radio/si4713-i2c.h index faf8cff12..faf8cff12 100644 --- a/linux/linux/drivers/media/radio/si4713-i2c.h +++ b/linux/drivers/media/radio/si4713-i2c.h diff --git a/linux/linux/include/media/radio-si4713.h b/linux/include/media/radio-si4713.h index f6aae29c7..f6aae29c7 100644 --- a/linux/linux/include/media/radio-si4713.h +++ b/linux/include/media/radio-si4713.h diff --git a/linux/linux/include/media/si4713.h b/linux/include/media/si4713.h index 99850a54e..99850a54e 100644 --- a/linux/linux/include/media/si4713.h +++ b/linux/include/media/si4713.h |