Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / video / au1100fb.c

diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index befcbd8..15a6749 100644 (file)
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -535,7 +535,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev)
        for (page = (unsigned long)fbdev->fb_mem;
             page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len);
             page += PAGE_SIZE) {
-#if CONFIG_DMA_NONCOHERENT
+#ifdef CONFIG_DMA_NONCOHERENT
                SetPageReserved(virt_to_page(CAC_ADDR((void *)page)));
 #else
                SetPageReserved(virt_to_page(page));