Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/

[linux-2.6-omap-h63xx.git] / include / asm-mips / mach-ip27 / mmzone.h

diff --git a/include/asm-mips/mach-ip27/mmzone.h b/include/asm-mips/mach-ip27/mmzone.h
index d3f566362e9dc90966b6ab3dc7f326211f8762ff..986a3b9b59a7c0cefd0a7dbcb3a078bc7c456e9b 100644 (file)
--- 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];
 };