summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-12-20 02:53:13 -0500
committerLen Brown <len.brown@intel.com>2006-12-20 02:53:13 -0500
commit9774f3384125912eb491ca77f77907324db3ed05 (patch)
tree0bdc7486e911dd9e955b41283ee19ac74521f7bd /Documentation
parent3be11c8f4f2fa194834c2e83540f34da442b8977 (diff)
parentf238085415c56618e042252894f2fcc971add645 (diff)
downloadlinux-9774f3384125912eb491ca77f77907324db3ed05.tar.bz2
merge linus into test branch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/genericirq.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl
index 0f4a4b6321e4..4215f69ce7e6 100644
--- a/Documentation/DocBook/genericirq.tmpl
+++ b/Documentation/DocBook/genericirq.tmpl
@@ -303,10 +303,10 @@ desc->status |= running;
do {
if (desc->status &amp; masked)
desc->chip->enable();
- desc-status &amp;= ~pending;
+ desc->status &amp;= ~pending;
handle_IRQ_event(desc->action);
} while (status &amp; pending);
-desc-status &amp;= ~running;
+desc->status &amp;= ~running;
desc->chip->end();
</programlisting>
</para>