From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Thu, 9 Jul 2009 13:08:38 +0000 (+0400)
Subject: m68k: Fix redefinition of pgprot_noncached
X-Git-Tag: v2.6.31-rc8~12^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88;p=pandora-kernel.git

m68k: Fix redefinition of pgprot_noncached

arch/m68k/include/asm/pgtable_mm.h:148:1: warning: "pgprot_noncached" redefined
In file included from arch/m68k/include/asm/pgtable_mm.h:138,
                 from arch/m68k/include/asm/pgtable.h:4,
                 from include/linux/mm.h:40,
                 from include/linux/pagemap.h:7,
                 from include/linux/blkdev.h:12,
                 from arch/m68k/emu/nfblock.c:17:
include/asm-generic/pgtable.h:133:1: warning: this is the location of the previous definition

pgprot_noncached() should be defined _before_ including asm-generic/pgtable.h

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

Reading git-diff-tree failed