arm build breaks

[Paul Goyette <paul%whooppee.com@localhost>]

With sources updated just a few  hours ago (and not noticing any 
relevant commits since), I am seeing the following on 3 arm ports

        evbearmv6-el
        evbearmhf-el
        evbearmv6hf-el

In file included from /build/netbsd-local/src/sys/arch/arm/omap/obio_com.c:59:0:
/build/netbsd-local/src/sys/arch/arm/omap/omap2_reg.h:885:0: error: 
"OMAP5_CM_L3INIT_SATA_CLKCTRL" redefined [-Werror]
 #define OMAP5_CM_L3INIT_SATA_CLKCTRL  0x4a009688
 ^
/build/netbsd-local/src/sys/arch/arm/omap/omap2_reg.h:400:0: note: this is the 
location of the previous definition
 #define OMAP5_CM_L3INIT_SATA_CLKCTRL  0x0088
 ^
cc1: all warnings being treated as errors


-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------