diff --git a/[refs] b/[refs] index 5b9cd913a4e4..c62db5eea264 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab6c46e24a3c89c1e2d0d3959e119583e1bc92d9 +refs/heads/master: 6d43cec87f9d9679a5c4adca7935dc8cf207f6ce diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig index 408838418d04..a86504587447 100644 --- a/trunk/drivers/media/Kconfig +++ b/trunk/drivers/media/Kconfig @@ -160,7 +160,7 @@ config VIDEOBUF_GEN tristate config VIDEOBUF_DMA_SG - depends on PCI + depends on PCI || ARCH_PXA select VIDEOBUF_GEN tristate