From: Andrew Morton <akpm@osdl.org>

Cc: Woody Suwalski <woodys@xandros.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/video/cyber2000fb.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff -puN drivers/video/cyber2000fb.c~cyber2010-framebuffer-on-arm-netwinder-fix-tidy drivers/video/cyber2000fb.c
--- a/drivers/video/cyber2000fb.c~cyber2010-framebuffer-on-arm-netwinder-fix-tidy
+++ a/drivers/video/cyber2000fb.c
@@ -1539,12 +1539,9 @@ static int cyberpro_pci_enable_mmio(stru
 	/*
 	 * Allow the CyberPro to accept PCI burst accesses
 	 */
-	if (cfb->id == ID_CYBERPRO_2010)
-	{
+	if (cfb->id == ID_CYBERPRO_2010) {
 		printk(KERN_INFO "%s: NOT enabling PCI bursts\n", cfb->fb.fix.id);
-	}
-	else
-	{
+	} else {
 		val = cyber2000_grphr(EXT_BUS_CTL, cfb);
 		if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) {
 			printk(KERN_INFO "%s: enabling PCI bursts\n",
_