git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlegacy
/
iwl4965-base.c
diff --git
a/drivers/net/wireless/iwlegacy/iwl4965-base.c
b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index
46242d2
..
1433466
100644
(file)
--- a/
drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/
drivers/net/wireless/iwlegacy/iwl4965-base.c
@@
-1484,7
+1484,7
@@
static const char * const desc_lookup_text[] = {
"NMI_INTERRUPT_DATA_ACTION_PT",
"NMI_TRM_HW_ER",
"NMI_INTERRUPT_TRM",
- "NMI_INTERRUPT_BREAK_POINT"
+ "NMI_INTERRUPT_BREAK_POINT"
,
"DEBUG_0",
"DEBUG_1",
"DEBUG_2",