1 files changed, 3 insertions, 4 deletions

diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
index 25289884a607..925048e7adfe 100644
--- a/arch/arm/mach-ns9xxx/board-a9m9750dev.c
+++ b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
@@ -77,7 +77,7 @@ static void a9m9750dev_fpga_demux_handler(unsigned int irq,
 
                 desc = irq_desc + FPGA_IRQ(irqno);
 
-                desc_handle_irq(irqno, desc);
+                desc_handle_irq(FPGA_IRQ(irqno), desc);
         }
 }
 
@@ -91,7 +91,7 @@ void __init board_a9m9750dev_init_irq(void)
          * use GPIO 11, because GPIO 32 is used for the LCD
          */
         /* XXX: proper GPIO handling */
-        BBU_GC(2) &= ~0x2000;
+        BBU_GCONFb1(1) &= ~0x2000;
 
         for (i = FPGA_IRQ(0); i <= FPGA_IRQ(7); ++i) {
                 set_irq_chip(i, &a9m9750dev_fpga_chip);
@@ -178,7 +178,7 @@ void __init board_a9m9750dev_init_machine(void)
 
         /* setup static CS0: memory configuration */
         reg = MEM_SMC(0);
-        REGSET(reg, MEM_SMC, WSMC, OFF);
+        REGSET(reg, MEM_SMC, PSMC, OFF);
         REGSET(reg, MEM_SMC, BSMC, OFF);
         REGSET(reg, MEM_SMC, EW, OFF);
         REGSET(reg, MEM_SMC, PB, 1);
@@ -196,4 +196,3 @@ void __init board_a9m9750dev_init_machine(void)
         platform_add_devices(board_a9m9750dev_devices,
                         ARRAY_SIZE(board_a9m9750dev_devices));
 }
-