diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 09:48:33 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 09:48:33 +0200 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /arch/arm/mach-prima2 | |
| parent | Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable (diff) | |
| parent | ARM: kprobes: Add introductory comment to test code (diff) | |
| download | linux-f70cac8d9c7125f83048f8b3d1c60f5a041a165c.tar.xz linux-f70cac8d9c7125f83048f8b3d1c60f5a041a165c.zip | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-prima2')
| -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 f9a2aaf63f71..615a4e75ceab 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 c3404cbb6ff7..7af254d046ba 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 d074786e83d4..492cfa8d2610 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 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) |