diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:03:56 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:03:56 -0400 |
| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 (patch) | |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 /arch/arm/boot/dts/at91sam9263.dtsi | |
| parent | 5217192b85480353aeeb395574e60d0db04f3676 (diff) | |
| parent | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 (diff) | |
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
Diffstat (limited to 'arch/arm/boot/dts/at91sam9263.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index b460d6ce9eb5..195019b7ca0e 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi | |||
| @@ -95,6 +95,7 @@ | |||
| 95 | #gpio-cells = <2>; | 95 | #gpio-cells = <2>; |
| 96 | gpio-controller; | 96 | gpio-controller; |
| 97 | interrupt-controller; | 97 | interrupt-controller; |
| 98 | #interrupt-cells = <2>; | ||
| 98 | }; | 99 | }; |
| 99 | 100 | ||
| 100 | pioB: gpio@fffff400 { | 101 | pioB: gpio@fffff400 { |
| @@ -104,6 +105,7 @@ | |||
| 104 | #gpio-cells = <2>; | 105 | #gpio-cells = <2>; |
| 105 | gpio-controller; | 106 | gpio-controller; |
| 106 | interrupt-controller; | 107 | interrupt-controller; |
| 108 | #interrupt-cells = <2>; | ||
| 107 | }; | 109 | }; |
| 108 | 110 | ||
| 109 | pioC: gpio@fffff600 { | 111 | pioC: gpio@fffff600 { |
| @@ -113,6 +115,7 @@ | |||
| 113 | #gpio-cells = <2>; | 115 | #gpio-cells = <2>; |
| 114 | gpio-controller; | 116 | gpio-controller; |
| 115 | interrupt-controller; | 117 | interrupt-controller; |
| 118 | #interrupt-cells = <2>; | ||
| 116 | }; | 119 | }; |
| 117 | 120 | ||
| 118 | pioD: gpio@fffff800 { | 121 | pioD: gpio@fffff800 { |
| @@ -122,6 +125,7 @@ | |||
| 122 | #gpio-cells = <2>; | 125 | #gpio-cells = <2>; |
| 123 | gpio-controller; | 126 | gpio-controller; |
| 124 | interrupt-controller; | 127 | interrupt-controller; |
| 128 | #interrupt-cells = <2>; | ||
| 125 | }; | 129 | }; |
| 126 | 130 | ||
| 127 | pioE: gpio@fffffa00 { | 131 | pioE: gpio@fffffa00 { |
| @@ -131,6 +135,7 @@ | |||
| 131 | #gpio-cells = <2>; | 135 | #gpio-cells = <2>; |
| 132 | gpio-controller; | 136 | gpio-controller; |
| 133 | interrupt-controller; | 137 | interrupt-controller; |
| 138 | #interrupt-cells = <2>; | ||
| 134 | }; | 139 | }; |
| 135 | 140 | ||
| 136 | dbgu: serial@ffffee00 { | 141 | dbgu: serial@ffffee00 { |