diff --git a/[refs] b/[refs] index bf997ea4ce79..265c022b0d10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b23056ef373c27a3bd089b40f45f4bc74674e71c +refs/heads/master: 0518999c5fd640bfac24c7c452e902007b1a2b0a diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 94d078b77bab..6afe0cf09360 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -320,11 +320,16 @@ config VIDEO_M32R_AR camera module. config VIDEO_M32R_AR_M64278 - tristate "Use Colour AR module M64278(VGA)" - depends on VIDEO_M32R_AR && PLAT_M32700UT + tristate "AR device with color module M64278(VGA)" + depends on PLAT_M32700UT + select VIDEO_M32R_AR ---help--- - Say Y here to use the Renesas M64278E-800 camera module, - which supports VGA(640x480 pixcels) size of images. + This is a video4linux driver for the Renesas AR (Artificial + Retina) with M64278E-800 camera module. + This module supports VGA(640x480 pixels) resolutions. + + To compile this driver as a module, choose M here: the + module will be called arv. # # Encoder / Decoder module configuration