[PATCH] uClinux pgprot bits

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 97e585a9036185bb7889fb4b06ca1a1640967f89..129bce3a0d73820b235499c85f19fa22008dbad6 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -140,7 +140,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
                prot |= _PAGE_PCD | _PAGE_PWT;
 #elif defined(__powerpc__)
        prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
-#elif defined(__mc68000__)
+#elif defined(__mc68000__) && defined(CONFIG_MMU)
 #ifdef SUN3_PAGE_NOCACHE
        if (MMU_IS_SUN3)
                prot |= SUN3_PAGE_NOCACHE;

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index c8f357a2944e506253c39111b0dd1e9e5db20a83..ee4c1d188385bb7dfe0408770501a60f01337334 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -612,7 +612,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 #if defined(__mc68000__)
 #if defined(CONFIG_SUN3)
        pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
-#else
+#elif defined(CONFIG_MMU)
        if (CPU_IS_020_OR_030)
                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
        if (CPU_IS_040_OR_060) {