diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 09:39:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 09:39:24 -0300 |
| commit | deef1e3e15b7a504f86c23ab68075eaecfb55499 (patch) | |
| tree | 34ff1fecb226809b782abc7778251f42c15695d9 /linux/drivers | |
| parent | 7abbab1a9801ad11729cc746653a909972548502 (diff) | |
| download | mediapointer-dvb-s2-deef1e3e15b7a504f86c23ab68075eaecfb55499.tar.gz mediapointer-dvb-s2-deef1e3e15b7a504f86c23ab68075eaecfb55499.tar.bz2 | |
Some few kernel syncs: update i2c-id.h and cleans whitespace on a Kconfig file
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 70a96a361..2a747db6d 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -641,8 +641,8 @@ config VIDEO_ZORAN_ZR36060 depends on VIDEO_ZORAN help Say Y to support Zoran boards based on 36060 chips. - This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33 - and 33 R10 and AverMedia 6 boards. + This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33 + and 33 R10 and AverMedia 6 boards. config VIDEO_ZORAN_BUZ tristate "Iomega Buz support" |