diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-04 19:51:58 -0500 |
| commit | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch) | |
| tree | bc3ef1b64dcdb48b2d6accb51951a0d73b33262e /arch/blackfin/mach-common/interrupt.S | |
| parent | 4d7902f22b0804730b80f7a4147f676430248a3a (diff) | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/blackfin/mach-common/interrupt.S')
| -rw-r--r-- | arch/blackfin/mach-common/interrupt.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S index 473df0f7fa78..43c4eb9acb65 100644 --- a/arch/blackfin/mach-common/interrupt.S +++ b/arch/blackfin/mach-common/interrupt.S | |||
| @@ -195,7 +195,7 @@ ENDPROC(_evt_ivhw) | |||
| 195 | /* Interrupt routine for evt2 (NMI). | 195 | /* Interrupt routine for evt2 (NMI). |
| 196 | * We don't actually use this, so just return. | 196 | * We don't actually use this, so just return. |
| 197 | * For inner circle type details, please see: | 197 | * For inner circle type details, please see: |
| 198 | * http://docs.blackfin.uclinux.org/doku.php?id=linux:nmi | 198 | * http://docs.blackfin.uclinux.org/doku.php?id=linux-kernel:nmi |
| 199 | */ | 199 | */ |
| 200 | ENTRY(_evt_nmi) | 200 | ENTRY(_evt_nmi) |
| 201 | .weak _evt_nmi | 201 | .weak _evt_nmi |