diff --git a/[refs] b/[refs] index 50b124a72e95..97e1a35ca1cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 073adf4fa7f91a91f64a88af278a5d2b075c1e83 +refs/heads/master: c915bedf221ad4f017710865fc963b1e0dda1390 diff --git a/trunk/arch/arm/boot/dts/prima2-cb.dts b/trunk/arch/arm/boot/dts/prima2-cb.dts index a0a423d1d573..af86931bdcc6 100644 --- a/trunk/arch/arm/boot/dts/prima2-cb.dts +++ b/trunk/arch/arm/boot/dts/prima2-cb.dts @@ -279,7 +279,7 @@ gpio: gpio-controller@b0120000 { #gpio-cells = <2>; #interrupt-cells = <2>; - compatible = "sirf,prima2-gpio"; + compatible = "sirf,prima2-gpio-pinmux"; reg = <0xb0120000 0x10000>; gpio-controller; interrupt-controller;