Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm4708-buffalo-wzr-1750dhp.dts

diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
index 9cb186ea2e979776bdde34a944eb79cac1d1011c..c9ba6b964b3853941961ca6f22c1cd207fb366fa 100644 (file)
--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -21,7 +21,8 @@
        };
 
        memory {
-               reg = <0x00000000 0x08000000>;
+               reg = <0x00000000 0x08000000
+                      0x88000000 0x18000000>;
        };
 
        spi {
@@ -136,10 +137,6 @@
        };
 };
 
-&uart0 {
-       status = "okay";
-};
-
 &usb2 {
        vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
 };