merge r15255 to 8.09 (fixed)

SVN-Revision: 15318

diff --git a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
index fb69cc4aab0336742efe33cd79b0db67fde35201..12695be8df9918b1e09301f1e852fc53108b8fb3 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
@@ -131,7 +131,7 @@
  {
        int i = 0;
  
-@@ -72,52 +102,141 @@
+@@ -72,52 +102,142 @@
        }
  }
  
@@ -274,6 +274,7 @@
 +
 +              memset(&s, 0, sizeof(s));
 +              s.line = i;
++              s.mapbase = (unsigned int) port->regs;
 +              s.membase = port->regs;
 +              s.irq = port->irq + 2;
 +              s.uartclk = port->baud_base;