Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f84b626 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote-tracking branch 'origin/x86/fpu' into queue/x86/cpu 



Use the union of 3.10 x86/cpu and x86/fpu as baseline.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents 719038de 5f8c4218

Documentation/devicetree/bindings/net/macb.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible: Should be "cdns,[<chip>-]{macb|gem}"

  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.

  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".

  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt