diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 20:10:09 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 20:10:09 -0200 |
commit | 07310480aa20dd3b3ba3bc0c5cd96a0cab6e63a5 (patch) | |
tree | 858fdb806d06a1b121bd3eb2a725357150a9c3f7 /linux/drivers/media/radio/Kconfig | |
parent | 5e175b73ce763bcf08352450b452f43928285236 (diff) | |
download | mediapointer-dvb-s2-07310480aa20dd3b3ba3bc0c5cd96a0cab6e63a5.tar.gz mediapointer-dvb-s2-07310480aa20dd3b3ba3bc0c5cd96a0cab6e63a5.tar.bz2 |
saa7134: fix a merge conflict on Behold H6 board
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/radio/Kconfig')
0 files changed, 0 insertions, 0 deletions