summaryrefslogtreecommitdiffstats
path: root/drivers/pps
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-23 15:24:20 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-23 15:24:20 -0400
commit8101a5679bf5343904128bc38fa96c0a6b066e69 (patch)
tree7c1d18c8bd1ef0aed77006202213d70e75f0e3e3 /drivers/pps
parente676f197a7a9aae9c75b0d9acc97e07de07dd1f0 (diff)
parent2d283862dc62daead9db0dc89cd0d0351e91f765 (diff)
downloadlinux-8101a5679bf5343904128bc38fa96c0a6b066e69.tar.bz2
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/pps')
0 files changed, 0 insertions, 0 deletions