diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/mips/mips-boards/atlas/atlas_int.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/mips/mips-boards/atlas/atlas_int.c')
| -rw-r--r-- | arch/mips/mips-boards/atlas/atlas_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c index 8f1d875217a..19d4b079246 100644 --- a/arch/mips/mips-boards/atlas/atlas_int.c +++ b/arch/mips/mips-boards/atlas/atlas_int.c | |||
| @@ -122,7 +122,7 @@ void __init arch_init_irq(void) | |||
| 122 | int i; | 122 | int i; |
| 123 | 123 | ||
| 124 | atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); | 124 | atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); |
| 125 | 125 | ||
| 126 | /* | 126 | /* |
| 127 | * Mask out all interrupt by writing "1" to all bit position in | 127 | * Mask out all interrupt by writing "1" to all bit position in |
| 128 | * the interrupt reset reg. | 128 | * the interrupt reset reg. |