diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-01-29 02:09:51 -0500 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-24 01:17:42 -0400 |
| commit | e77d15511fc4e1554c500524dd43b9c162a2d95e (patch) | |
| tree | 20896c9bd734e2fdfb734793a6e5fb2a3f9aede6 | |
| parent | af85fe9e5e618de205ac6944ed9fe45ade0874bf (diff) | |
m68k: the one hw_irq.h can be used buy all m68k
The mmu and non-mmu hw_irq.h are identical, revert to a single copy.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/include/asm/hw_irq.h | 9 | ||||
| -rw-r--r-- | arch/m68k/include/asm/hw_irq_mm.h | 6 | ||||
| -rw-r--r-- | arch/m68k/include/asm/hw_irq_no.h | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h index e19526015890..eacef0951fbf 100644 --- a/arch/m68k/include/asm/hw_irq.h +++ b/arch/m68k/include/asm/hw_irq.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #ifdef __uClinux__ | 1 | #ifndef __ASM_M68K_HW_IRQ_H |
| 2 | #include "hw_irq_no.h" | 2 | #define __ASM_M68K_HW_IRQ_H |
| 3 | #else | 3 | |
| 4 | #include "hw_irq_mm.h" | 4 | /* Dummy include. */ |
| 5 | |||
| 5 | #endif | 6 | #endif |
diff --git a/arch/m68k/include/asm/hw_irq_mm.h b/arch/m68k/include/asm/hw_irq_mm.h deleted file mode 100644 index eacef0951fbf..000000000000 --- a/arch/m68k/include/asm/hw_irq_mm.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __ASM_M68K_HW_IRQ_H | ||
| 2 | #define __ASM_M68K_HW_IRQ_H | ||
| 3 | |||
| 4 | /* Dummy include. */ | ||
| 5 | |||
| 6 | #endif | ||
diff --git a/arch/m68k/include/asm/hw_irq_no.h b/arch/m68k/include/asm/hw_irq_no.h deleted file mode 100644 index f3ec9e5ae049..000000000000 --- a/arch/m68k/include/asm/hw_irq_no.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | #ifndef __M68KNOMMU_HW_IRQ_H__ | ||
| 2 | #define __M68KNOMMU_HW_IRQ_H__ | ||
| 3 | |||
| 4 | #endif /* __M68KNOMMU_HW_IRQ_H__ */ | ||