diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2011-09-12 14:59:37 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2011-09-12 14:59:37 +0000 |
| commit | d035953e59ca8bb7ffc1023efba72438524457bb (patch) | |
| tree | 424c432d5ad28a947644204a6273428f03d54c0c /arch/arm/mach-prima2/timer.c | |
| parent | Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes (diff) | |
| parent | ARM: CSR: add missing sentinels to of_device_id tables (diff) | |
| download | linux-d035953e59ca8bb7ffc1023efba72438524457bb.tar.gz linux-d035953e59ca8bb7ffc1023efba72438524457bb.tar.bz2 linux-d035953e59ca8bb7ffc1023efba72438524457bb.zip | |
Merge branch 'sirf/fixes' into fixes
Diffstat (limited to 'arch/arm/mach-prima2/timer.c')
| -rw-r--r-- | arch/arm/mach-prima2/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c index 44027f34a88a..ed7ec48d11da 100644 --- a/arch/arm/mach-prima2/timer.c +++ b/arch/arm/mach-prima2/timer.c @@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void) static struct of_device_id timer_ids[] = { { .compatible = "sirf,prima2-tick" }, + {}, }; static void __init sirfsoc_of_timer_map(void) |