Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 370687
b: refs/heads/master
c: 630be7e
h: refs/heads/master
i:
  370685: ea21bca
  370683: a545e55
  370679: d36eb8b
  370671: d5b549e
  370655: be10259
  370623: f85a1df
  370559: 52d3f08
  370431: 65f9c17
  370175: 430e3ea
  369663: d89d107
  368639: ff4a465
v: v3
  • Loading branch information
Arnd Bergmann committed Mar 25, 2013
1 parent 5bc89da commit 14862cc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 60dbd7680f069c07525a825d805fd2644eae92e6
refs/heads/master: 630be7ea2f2d0c2ee5662308297b77087da2ace2
1 change: 1 addition & 0 deletions trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ config ARCH_SIRF
select PINCTRL
select PINCTRL_SIRF
select USE_OF
select SPARSE_IRQ
help
Support for CSR SiRFprimaII/Marco/Polo platforms

Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-prima2/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ static const char *atlas6_dt_match[] __initdata = {

DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.nr_irqs = 128,
.map_io = sirfsoc_map_io,
.init_irq = irqchip_init,
.init_time = sirfsoc_prima2_timer_init,
Expand All @@ -63,6 +64,7 @@ static const char *prima2_dt_match[] __initdata = {

DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.nr_irqs = 128,
.map_io = sirfsoc_map_io,
.init_irq = irqchip_init,
.init_time = sirfsoc_prima2_timer_init,
Expand Down
17 changes: 0 additions & 17 deletions trunk/arch/arm/mach-prima2/include/mach/irqs.h

This file was deleted.

0 comments on commit 14862cc

Please sign in to comment.