diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 00:50:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 00:50:26 -0500 |
| commit | ffafe770a4160862476405a442d28ee48d2249ef (patch) | |
| tree | 5bb7d5913427c245c61dd5eb384321dff386f841 /arch/arm/boot | |
| parent | 0dcd627896fb87b2e78a1ed78e469591208cffcd (diff) | |
| parent | da911782be4c82dc1222aa0cb5bef28605d1e117 (diff) | |
Merge branch 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (2 commits)
ARM: EXYNOS: Add cpu-offset property in gic device tree node
ARM: EXYNOS: Bring exynos4-dt up to date
Linux 3.3-rc3
This includes an update to the v3.3-rc3 release from v3.3-rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos4210.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 63d7578856c1..a1dd2ee83753 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | compatible = "arm,cortex-a9-gic"; | 29 | compatible = "arm,cortex-a9-gic"; |
| 30 | #interrupt-cells = <3>; | 30 | #interrupt-cells = <3>; |
| 31 | interrupt-controller; | 31 | interrupt-controller; |
| 32 | cpu-offset = <0x8000>; | ||
| 32 | reg = <0x10490000 0x1000>, <0x10480000 0x100>; | 33 | reg = <0x10490000 0x1000>, <0x10480000 0x100>; |
| 33 | }; | 34 | }; |
| 34 | 35 | ||