Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[karo-tx-linux.git] / include / linux / via-core.h

diff --git a/include/linux/via-core.h b/include/linux/via-core.h
index a4327a0c8efcbcbba9486d95094998fc980f5849..9c21cdf3e3b386e3090d1d4d57fe7860c6bb7be5 100644 (file)
--- a/include/linux/via-core.h
+++ b/include/linux/via-core.h
@@ -96,7 +96,7 @@ struct viafb_dev {
        unsigned long fbmem_start;
        long fbmem_len;
        void __iomem *fbmem;
-#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE)
+#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
        long camera_fbmem_offset;
        long camera_fbmem_size;
 #endif
@@ -153,6 +153,7 @@ void viafb_irq_disable(u32 mask);
 #define   VDE_I_LVDSSIEN  0x40000000  /* LVDS Sense enable */
 #define   VDE_I_ENABLE   0x80000000  /* Global interrupt enable */
 
+#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
 /*
  * DMA management.
  */
@@ -187,6 +188,7 @@ int viafb_dma_copy_out_sg(unsigned int offset, struct scatterlist *sg, int nsg);
  */
 #define VGA_WIDTH      640
 #define VGA_HEIGHT     480
+#endif /* CONFIG_VIDEO_VIA_CAMERA */
 
 /*
  * Indexed port operations.  Note that these are all multi-op