summaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 04:28:13 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 04:28:13 -0500
commit99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed (patch)
tree6f977546112ccbd617ef40ae38a1ca558d71bce9 /include/asm-m68knommu
parent332b5a52f2f96bc2d13bbe594a430318c0ee4425 (diff)
parent8a19ac89edbe9b702c10fd2039b8cb2db4644a5f (diff)
downloadtalos-op-linux-99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed.tar.gz
talos-op-linux-99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed.zip
Merge branch 'upstream'
Diffstat (limited to 'include/asm-m68knommu')
-rw-r--r--include/asm-m68knommu/hardirq.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-m68knommu/hardirq.h b/include/asm-m68knommu/hardirq.h
index e8659e739a64..476180f4cba2 100644
--- a/include/asm-m68knommu/hardirq.h
+++ b/include/asm-m68knommu/hardirq.h
@@ -4,6 +4,7 @@
#include <linux/config.h>
#include <linux/cache.h>
#include <linux/threads.h>
+#include <asm/irq.h>
typedef struct {
unsigned int __softirq_pending;
OpenPOWER on IntegriCloud