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 | |
| parent | 1f51b001cccf3a16b9191de3dc67c58689cc44d6 (diff) | |
| parent | 6a53747be5f02ba7b37ff5131330363270782dc3 (diff) | |
| download | op-kernel-dev-d035953e59ca8bb7ffc1023efba72438524457bb.zip op-kernel-dev-d035953e59ca8bb7ffc1023efba72438524457bb.tar.gz | |
Merge branch 'sirf/fixes' into fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-prima2/clock.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-prima2/irq.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-prima2/rstc.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-prima2/timer.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c index f9a2aaf..615a4e7 100644 --- a/arch/arm/mach-prima2/clock.c +++ b/arch/arm/mach-prima2/clock.c @@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void) static struct of_device_id clkc_ids[] = { { .compatible = "sirf,prima2-clkc" }, + {}, }; void __init sirfsoc_of_clk_init(void) diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c index c3404cb..7af254d 100644 --- a/arch/arm/mach-prima2/irq.c +++ b/arch/arm/mach-prima2/irq.c @@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void) static struct of_device_id intc_ids[] = { { .compatible = "sirf,prima2-intc" }, + {}, }; void __init sirfsoc_of_irq_init(void) diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c index d074786..492cfa8 100644 --- a/arch/arm/mach-prima2/rstc.c +++ b/arch/arm/mach-prima2/rstc.c @@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock); static struct of_device_id rstc_ids[] = { { .compatible = "sirf,prima2-rstc" }, + {}, }; static int __init sirfsoc_of_rstc_init(void) diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c index 44027f3..ed7ec48 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) |
