History

Merge branch 'sirf/fixes' into fixes

Arnd Bergmann committed 15 years ago

Commit d0359532 parents 1f51b00 6a537474 files · +4 −0Browse files

Unified · Split

4 files
  1. arch/arm/mach-prima2/clock.c +1 −0
  2. arch/arm/mach-prima2/irq.c +1 −0
  3. arch/arm/mach-prima2/rstc.c +1 −0
  4. arch/arm/mach-prima2/timer.c +1 −0
arch/arm/mach-prima2/clock.c+1−0
@@ -481,6 +481,7 @@ static void __init sirfsoc_clk_init(void) · 480 unmodified lines
481 481
482static struct of_device_id clkc_ids[] = {482static struct of_device_id clkc_ids[] = {
483 { .compatible = "sirf,prima2-clkc" },483 { .compatible = "sirf,prima2-clkc" },
484 {},
484};485};
485 486
486void __init sirfsoc_of_clk_init(void)487void __init sirfsoc_of_clk_init(void)
arch/arm/mach-prima2/irq.c+1−0
@@ -51,6 +51,7 @@ static __init void sirfsoc_irq_init(void) · 50 unmodified lines
51 51
52static struct of_device_id intc_ids[] = {52static struct of_device_id intc_ids[] = {
53 { .compatible = "sirf,prima2-intc" },53 { .compatible = "sirf,prima2-intc" },
54 {},
54};55};
55 56
56void __init sirfsoc_of_irq_init(void)57void __init sirfsoc_of_irq_init(void)
arch/arm/mach-prima2/rstc.c+1−0
@@ -19,6 +19,7 @@ static DEFINE_MUTEX(rstc_lock); · 18 unmodified lines
19 19
20static struct of_device_id rstc_ids[] = {20static struct of_device_id rstc_ids[] = {
21 { .compatible = "sirf,prima2-rstc" },21 { .compatible = "sirf,prima2-rstc" },
22 {},
22};23};
23 24
24static int __init sirfsoc_of_rstc_init(void)25static int __init sirfsoc_of_rstc_init(void)
arch/arm/mach-prima2/timer.c+1−0
@@ -190,6 +190,7 @@ static void __init sirfsoc_timer_init(void) · 189 unmodified lines
190 190
191static struct of_device_id timer_ids[] = {191static struct of_device_id timer_ids[] = {
192 { .compatible = "sirf,prima2-tick" },192 { .compatible = "sirf,prima2-tick" },
193 {},
193};194};
194 195
195static void __init sirfsoc_of_timer_map(void)196static void __init sirfsoc_of_timer_map(void)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t