diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 13:19:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 13:19:03 -0800 |
| commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
| tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/mach-prima2/rtciobrg.c | |
| parent | f015941f6b4a7d4d90c46a65bca17f2c2c41fb89 (diff) | |
| parent | f7c66dc0bf0f4ecd349c79315c87841c67e27aef (diff) | |
| download | blackbird-op-linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.gz blackbird-op-linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.zip | |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/mach-prima2/rtciobrg.c')
| -rw-r--r-- | arch/arm/mach-prima2/rtciobrg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/rtciobrg.c b/arch/arm/mach-prima2/rtciobrg.c index 557353602130..9f2da2eec4dc 100644 --- a/arch/arm/mach-prima2/rtciobrg.c +++ b/arch/arm/mach-prima2/rtciobrg.c @@ -104,6 +104,7 @@ EXPORT_SYMBOL_GPL(sirfsoc_rtc_iobrg_writel); static const struct of_device_id rtciobrg_ids[] = { { .compatible = "sirf,prima2-rtciobg" }, + { .compatible = "sirf,marco-rtciobg" }, {} }; |
