m68k: Fix redefinition of pgprot_noncached
authorAlexey Dobriyan <adobriyan@gmail.com>
Thu, 9 Jul 2009 13:08:38 +0000 (17:08 +0400)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Wed, 26 Aug 2009 21:14:49 +0000 (23:14 +0200)
commit9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88
treef40de3049c6d25732dfd844b4cb703629899da32
parentdc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8
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>
arch/m68k/include/asm/pgtable_mm.h