diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-15 23:24:46 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-15 23:24:46 -0500 |
| commit | 8e9c931b8e4150f3c5aaab7e4639cd507c30477c (patch) | |
| tree | 4c77bef833db938a950c60095f628acc1ebff50a /arch/arm/boot/dts/highbank.dts | |
| parent | 3524a83e5459ae4ba42f9bf098bb736b99b88695 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
Merge commit 'v3.4-rc3' into rt-3.4-rc3-rt4v3.4-rc3-rt4
Diffstat (limited to 'arch/arm/boot/dts/highbank.dts')
| -rw-r--r-- | arch/arm/boot/dts/highbank.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts index 37c0ff9c8b90..83e72294aefb 100644 --- a/arch/arm/boot/dts/highbank.dts +++ b/arch/arm/boot/dts/highbank.dts @@ -89,7 +89,6 @@ #size-cells = <0>; #address-cells = <1>; interrupt-controller; - interrupt-parent; reg = <0xfff11000 0x1000>, <0xfff10100 0x100>; }; |