diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 10:26:07 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 10:27:36 +0100 |
commit | 458ce2910aa83d8a2cafb489d727f7da839e73c6 (patch) | |
tree | 28e088137eb068e5620f17eaf0ca19d1562006ed /arch/arm/boot/dts/at91sam9g20.dtsi | |
parent | 69466466ce889cd2cbc8cda9ff1c6083f48cc7f9 (diff) | |
parent | 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691 (diff) | |
download | linux-stable-458ce2910aa83d8a2cafb489d727f7da839e73c6.tar.gz linux-stable-458ce2910aa83d8a2cafb489d727f7da839e73c6.tar.bz2 linux-stable-458ce2910aa83d8a2cafb489d727f7da839e73c6.zip |
Merge branch 'linus' into x86/asm
Sync up the latest NMI fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g20.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9g20.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi index aeef04269cf8..07603b8c9503 100644 --- a/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/arch/arm/boot/dts/at91sam9g20.dtsi @@ -114,6 +114,13 @@ atmel,use-dma-tx; status = "disabled"; }; + + macb0: ethernet@fffc4000 { + compatible = "cdns,at32ap7000-macb", "cdns,macb"; + reg = <0xfffc4000 0x100>; + interrupts = <21>; + status = "disabled"; + }; }; }; }; |