diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 13:27:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 13:27:43 +1000 |
| commit | 7dfb08977e66e59ddb98b136a4be473cebec6f24 (patch) | |
| tree | f235e17b6b125b09af3e0d9d6fa98a26bbc4b296 /include/linux | |
| parent | 74a9bea34953d795b118227b02190da65315ebae (diff) | |
| parent | 426d52674f5dcc0f05164d5726dfc237c45fd578 (diff) | |
Merge remote branch 'viafb/viafb-next'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/via-core.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/via-core.h b/include/linux/via-core.h index 7ffb521e1a7a..38bffd8ccca5 100644 --- a/include/linux/via-core.h +++ b/include/linux/via-core.h @@ -81,7 +81,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 @@ -138,6 +138,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. */ @@ -172,6 +173,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 |