]> err.no Git - linux-2.6/commit
[ARM] 4090/2: avoid clash between PXA and SA1111 defines
authorNicolas Pitre <nico@cam.org>
Sat, 17 Feb 2007 02:18:39 +0000 (03:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 17 Feb 2007 11:27:25 +0000 (11:27 +0000)
commitbc43fd40ea9d4183fb0bab00f55af2da0ab46979
tree5bff6a274312d2fcca7b83420489c6c29e568019
parentca83b0bcf875cd20cb5226d1fc7e828d9e0cc269
[ARM] 4090/2: avoid clash between PXA and SA1111 defines

The Lubbock platform uses both a PXA25x and a SA1111 at the same time.
Both chips have the same "Serial Audio Controller" registers although
the SA1111 one is never expected to be used in preference to the PXA25x
one. So let's disable the SA1111 defines whenever compilation is for a
PXA architecture and make the PXA defines always defined.

This removes a bunch of "already defined" warnings as well since the
current hack to prevent them depended on include ordering which wasn't
always right.

While at it, clean up the SA1111 defines allowing to get rid of the
__CCREG() macro.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
include/asm-arm/arch-pxa/pxa-regs.h
include/asm-arm/hardware/sa1111.h