asm-generic/io.h: remove asm/cacheflush.h include
authorJames Hogan <james.hogan@imgtec.com>
Tue, 23 Oct 2012 09:21:57 +0000 (10:21 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 14:06:57 +0000 (16:06 +0200)
commit9b04ebd1584766229c58fedaa8fe4dfff575ac3a
tree21bd46274bcdb0ed9e3167d85a0301fe546f2ccc
parent6f0c0580b70c89094b3422ba81118c7b959c7556
asm-generic/io.h: remove asm/cacheflush.h include

Including <asm/cacheflush.h> from <asm-generic/io.h> prevents
cacheflush.h being able to use I/O functions like readl and writel due
to circular include dependencies. It doesn't appear as if anything from
cacheflush.h is actually used by the generic io.h, so remove the
include.

I've compile tested a defconfig compilation of blackfin, openrisc (which
needed <asm/pgtable.h> including from it's <asm/io.h> to get the PAGE_*
definitions), and xtensa.

Other architectures which use asm-generic/io.h are score and unicore32,
and looking at their io.h I don't see any obvious problems.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Jonas Bonn <jonas@southpole.se>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/openrisc/include/asm/io.h
include/asm-generic/io.h