summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/at91sam9g20.dtsi
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-04-25 12:24:16 +0200
committerIngo Molnar <mingo@kernel.org>2012-04-25 12:24:16 +0200
commitcd32b1616bc79b2f2ce1b1c6164beecfecc2259c (patch)
tree2e91c49b5c2bd927b9b74b7414dbb6839af601e1 /arch/arm/boot/dts/at91sam9g20.dtsi
parent89b8835ec865dddd6673a8dd7003581bf2377176 (diff)
parenta720b2dd2470a52345df11dca8d6c1466599f812 (diff)
Merge tag 'l3-fix-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent
A small L3 cache index disable fix from Srivatsa Bhat which unifies the way the code checks for already disabled indices. ( Pulling it into v3.4 despite the v3.5 tag - the fix is small and we better keep the same code across kernel versions for such user facing interfaces. ) Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g20.dtsi')
-rw-r--r--arch/arm/boot/dts/at91sam9g20.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 799ad1889b51..773ef484037a 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -55,7 +55,6 @@
#interrupt-cells = <2>;
compatible = "atmel,at91rm9200-aic";
interrupt-controller;
- interrupt-parent;
reg = <0xfffff000 0x200>;
};