Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / aspeed-bmc-intel-s2600wf.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
index 1deb30e..6e9baf3 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
@@ -22,9 +22,9 @@
                #size-cells = <1>;
                ranges;
 
-               vga_memory: framebuffer@7f000000 {
+               vga_memory: framebuffer@9f000000 {
                        no-map;
-                       reg = <0x7f000000 0x01000000>;
+                       reg = <0x9f000000 0x01000000>; /* 16M */
                };
        };