]> err.no Git - linux-2.6/commit
[ARM] Remove asm/hardware.h include from SA1100 io.h
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 25 Nov 2005 15:33:12 +0000 (15:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 25 Nov 2005 15:33:12 +0000 (15:33 +0000)
commit225937bd5d69a40b886f47a7bc1f0837882586e3
treee78b930cdbe18da5b914e727343bcb28e5781a39
parentcd0cca7bf5e201dcea5632f78ad9b37cb419a5df
[ARM] Remove asm/hardware.h include from SA1100 io.h

Unfortunately, we have a symbol clash between the SA-1100 header and
some drivers.  Since everywhere which needs SA1100 specifics includes
asm/hardware.h, we don't need to include it in the SA1100 io.h header.

In file included from drivers/net/wireless/wavelan_cs.p.h:459,
                 from drivers/net/wireless/wavelan_cs.c:60:
drivers/net/wireless/wavelan_cs.h:97:1: warning: "LCSR" redefined
In file included from include/asm/arch/hardware.h:56,
                 from include/asm/hardware.h:16,
                 from include/asm/arch/io.h:13,
                 from include/asm/io.h:71,
                 from drivers/net/wireless/wavelan_cs.p.h:433,
                 from drivers/net/wireless/wavelan_cs.c:60:
include/asm/arch/SA-1100.h:1907:1: warning: this is the location of the previous definition

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
include/asm-arm/arch-sa1100/io.h