1 files changed, 7 insertions, 6 deletions

diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
index 660f881b620a..2db3546fc874 100644
--- a/arch/blackfin/mach-common/ints-priority-dc.c
+++ b/arch/blackfin/mach-common/ints-priority-dc.c
@@ -221,7 +221,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq)
 
         if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
 
-                ret = gpio_request(gpionr, NULL);
+                ret = gpio_request(gpionr, "IRQ");
                 if (ret)
                         return ret;
 
@@ -261,7 +261,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type)
 
                 if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
 
-                        ret = gpio_request(gpionr, NULL);
+                        ret = gpio_request(gpionr, "IRQ");
                         if (ret)
                                 return ret;
 
@@ -362,10 +362,11 @@ void __init init_exception_vectors(void)
 {
         SSYNC();
 
-#ifndef CONFIG_KGDB
-        bfin_write_EVT0(evt_emulation);
-#endif
-        bfin_write_EVT2(evt_evt2);
+        /* cannot program in software:
+         * evt0 - emulation (jtag)
+         * evt1 - reset
+         */
+        bfin_write_EVT2(evt_nmi);
         bfin_write_EVT3(trap);
         bfin_write_EVT5(evt_ivhw);
         bfin_write_EVT6(evt_timer);