diff options
| author | David S. Miller | 2014-04-23 21:24:20 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-04-23 21:24:20 +0200 |
| commit | 8101a5679bf5343904128bc38fa96c0a6b066e69 (patch) | |
| tree | 7c1d18c8bd1ef0aed77006202213d70e75f0e3e3 /drivers/net/phy | |
| parent | macvlan: Fix leak and NULL dereference on error path (diff) | |
| parent | net: via-rhine: add OF bus binding (diff) | |
| download | kernel-qcow2-linux-8101a5679bf5343904128bc38fa96c0a6b066e69.tar.gz kernel-qcow2-linux-8101a5679bf5343904128bc38fa96c0a6b066e69.tar.xz kernel-qcow2-linux-8101a5679bf5343904128bc38fa96c0a6b066e69.zip | |
Merge branch 'via-rhine'
Alexey Charkov says:
====================
net: via-rhine: add support for on-chip Rhine controllers
This series introduces platform bus (OpenFirmware) binding for
via-rhine, as used in various ARM-based Systems-on-Chip by
VIA/WonderMedia.
This has been tested in OF configuration by myself on a WM8950-based VIA
APC Rock development board and on a WM8850-based netbook, and in PCI
configuration by Roger.
Please note that the initial version of these patches was signed off by
Roger, but some time has passed since then, so I'm not including his
sign-off until explicit notice.
Changes since v1:
- Fixed indentation of function arguments
- Switched to 'dev_is_pci' instead of string comparison on bus name
- Dropped 'rhine,revision' DT attribute, put the revision into OF match
table instead
- Included actual device tree nodes where applicable
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
0 files changed, 0 insertions, 0 deletions