diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-20 00:53:28 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-20 00:53:28 -0400 |
| commit | e6b0b6a82f9c93fe3dd060ae54719456474a74a3 (patch) | |
| tree | 89528134f61971718b1fa363b54bc3c7cebf1392 /Documentation/devicetree/bindings/net/fsl-fec.txt | |
| parent | 83bc5fd29afff5898cadf87fb29eb9260eecc63e (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | talos-obmc-linux-e6b0b6a82f9c93fe3dd060ae54719456474a74a3.tar.gz talos-obmc-linux-e6b0b6a82f9c93fe3dd060ae54719456474a74a3.zip | |
Merge tag 'v3.5-rc7' into drm-next
Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c
Diffstat (limited to 'Documentation/devicetree/bindings/net/fsl-fec.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/fsl-fec.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt index 7ab9e1a2d8be..4616fc28ee86 100644 --- a/Documentation/devicetree/bindings/net/fsl-fec.txt +++ b/Documentation/devicetree/bindings/net/fsl-fec.txt @@ -19,6 +19,6 @@ ethernet@83fec000 { reg = <0x83fec000 0x4000>; interrupts = <87>; phy-mode = "mii"; - phy-reset-gpios = <&gpio1 14 0>; /* GPIO2_14 */ + phy-reset-gpios = <&gpio2 14 0>; /* GPIO2_14 */ local-mac-address = [00 04 9F 01 1B B9]; }; |
