diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-06-30 10:46:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-02 00:18:13 +0300 |
| commit | 9d46b7701c30b308a3f3765bd33c1e69ccf4d9a2 (patch) | |
| tree | 4a6fb8a6527f9ccc8cefa4e3760933a44964e915 /drivers/nfc/nfcsim.c | |
| parent | f1efece4e2a28df1635b20a6345a9cba034dbda5 (diff) | |
| download | linux-9d46b7701c30b308a3f3765bd33c1e69ccf4d9a2.tar.xz | |
arm: sunxi: Revert changes merged through net-next.
This reverts commits 2c0cba482e79 ("arm: sun8i: sunxi-h3-h5: Add dt node
for the syscon control module") to 2428fd0fe550 ("arm64: defconfig: Enable
dwmac-sun8i driver on defconfig") and 3432a86e641c ("arm: sun8i:
orangepipc: use internal phy-mode") to 5a79b4f2a5e7 ("arm: sun8i:
orangepi-2: use internal phy-mode") that should be merged
through the arm-soc tree, and end up in merge conflicts and build failures.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/nfcsim.c')
0 files changed, 0 insertions, 0 deletions