Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / efm32gg.dtsi

diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi
index a342ab0e6e4f9098df459d0824c3dafa21868075..106d505c5d3d816fb096ab6c5e2e23843e134bfd 100644 (file)
--- a/arch/arm/boot/dts/efm32gg.dtsi
+++ b/arch/arm/boot/dts/efm32gg.dtsi
@@ -84,7 +84,7 @@
                        status = "disabled";
                };
 
-               spi2: spi@40x4000c800 { /* USART2 */
+               spi2: spi@4000c800 { /* USART2 */
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "efm32,spi";
@@ -110,7 +110,7 @@
                        status = "disabled";
                };
 
-               uart2: uart@40x4000c800 { /* USART2 */
+               uart2: uart@4000c800 { /* USART2 */
                        compatible = "efm32,uart";
                        reg = <0x4000c800 0x400>;
                        interrupts = <18 19>;