diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 08:22:57 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 08:22:57 +0400 |
| commit | b5831174f9d3f12a492deda6374ca96f87b694f8 (patch) | |
| tree | 96aa46239200021f9545bda5836f7e80a640d88b /arch/arm/boot/dts/kizbox.dts | |
| parent | 40a1ef95da85843696fc3ebe5fce39b0db32669f (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| download | linux-b5831174f9d3f12a492deda6374ca96f87b694f8.tar.xz | |
Merge tag 'v3.8-rc6' into x86/urgent
Linux 3.8-rc6
Merged in order to add a documentation update versus new code in
upstream.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/boot/dts/kizbox.dts')
| -rw-r--r-- | arch/arm/boot/dts/kizbox.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts index e8814fe0e277..b4dc3ed9a3ec 100644 --- a/arch/arm/boot/dts/kizbox.dts +++ b/arch/arm/boot/dts/kizbox.dts @@ -48,6 +48,8 @@ macb0: ethernet@fffc4000 { phy-mode = "mii"; + pinctrl-0 = <&pinctrl_macb_rmii + &pinctrl_macb_rmii_mii_alt>; status = "okay"; }; |