summaryrefslogtreecommitdiff
path: root/include/asm-mips/mach-ip27/mmzone.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 23:39:24 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 23:39:24 +0300
commit7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (patch)
tree541909f86c31fee97cd70d28ec2fe5c23e1ceb02 /include/asm-mips/mach-ip27/mmzone.h
parentf1e691a24955ea987f021f378324fb5003b1b208 (diff)
parent70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff)
downloadlinux-7211bb9b64f17b23834d91fc3d0c1d78671ee9a8.tar.xz
Merge branch 'master'
Diffstat (limited to 'include/asm-mips/mach-ip27/mmzone.h')
-rw-r--r--include/asm-mips/mach-ip27/mmzone.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-ip27/mmzone.h b/include/asm-mips/mach-ip27/mmzone.h
index d3f566362e9d..986a3b9b59a7 100644
--- a/include/asm-mips/mach-ip27/mmzone.h
+++ b/include/asm-mips/mach-ip27/mmzone.h
@@ -10,7 +10,6 @@
#define LEVELS_PER_SLICE 128
struct slice_data {
- unsigned long irq_alloc_mask[2];
unsigned long irq_enable_mask[2];
int level_to_irq[LEVELS_PER_SLICE];
};
@@ -20,6 +19,7 @@ struct hub_data {
DECLARE_BITMAP(h_bigwin_used, HUB_NUM_BIG_WINDOW);
cpumask_t h_cpus;
unsigned long slice_map;
+ unsigned long irq_alloc_mask[2];
struct slice_data slice[2];
};