forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <[email protected]>
Showing
494 changed files
with
4,840 additions
and
2,963 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,7 @@ Date: Nov 2010 | |
Contact: Kay Sievers <[email protected]> | ||
Description: | ||
Shows the list of currently configured | ||
tty devices used for the console, | ||
like 'tty1 ttyS0'. | ||
console devices, like 'tty1 ttyS0'. | ||
The last entry in the file is the active | ||
device connected to /dev/console. | ||
The file supports poll() to detect virtual | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
* OpenCores MAC 10/100 Mbps | ||
|
||
Required properties: | ||
- compatible: Should be "opencores,ethoc". | ||
- reg: two memory regions (address and length), | ||
first region is for the device registers and descriptor rings, | ||
second is for the device packet memory. | ||
- interrupts: interrupt for the device. | ||
|
||
Optional properties: | ||
- clocks: phandle to refer to the clk used as per | ||
Documentation/devicetree/bindings/clock/clock-bindings.txt | ||
|
||
Examples: | ||
|
||
enet0: ethoc@fd030000 { | ||
compatible = "opencores,ethoc"; | ||
reg = <0xfd030000 0x4000 0xfd800000 0x4000>; | ||
interrupts = <1>; | ||
local-mac-address = [00 50 c2 13 6f 00]; | ||
clocks = <&osc>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.