Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

1 files changed, 0 insertions, 113 deletions

diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h
deleted file mode 100644
index b1bcdb8..0000000
--- a/include/asm-m68k/amigaints.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-** amigaints.h -- Amiga Linux interrupt handling structs and prototypes
-**
-** Copyright 1992 by Greg Harp
-**
-** This file is subject to the terms and conditions of the GNU General Public
-** License.  See the file COPYING in the main directory of this archive
-** for more details.
-**
-** Created 10/2/92 by Greg Harp
-*/
-
-#ifndef _ASMm68k_AMIGAINTS_H_
-#define _ASMm68k_AMIGAINTS_H_
-
-#include <asm/irq.h>
-
-/*
-** Amiga Interrupt sources.
-**
-*/
-
-#define AUTO_IRQS           (8)
-#define AMI_STD_IRQS        (14)
-#define CIA_IRQS            (5)
-#define AMI_IRQS            (32) /* AUTO_IRQS+AMI_STD_IRQS+2*CIA_IRQS */
-
-/* builtin serial port interrupts */
-#define IRQ_AMIGA_TBE		(IRQ_USER+0)
-#define IRQ_AMIGA_RBF		(IRQ_USER+11)
-
-/* floppy disk interrupts */
-#define IRQ_AMIGA_DSKBLK	(IRQ_USER+1)
-#define IRQ_AMIGA_DSKSYN	(IRQ_USER+12)
-
-/* software interrupts */
-#define IRQ_AMIGA_SOFT		(IRQ_USER+2)
-
-/* interrupts from external hardware */
-#define IRQ_AMIGA_PORTS		IRQ_AUTO_2
-#define IRQ_AMIGA_EXTER		IRQ_AUTO_6
-
-/* copper interrupt */
-#define IRQ_AMIGA_COPPER	(IRQ_USER+4)
-
-/* vertical blanking interrupt */
-#define IRQ_AMIGA_VERTB		(IRQ_USER+5)
-
-/* Blitter done interrupt */
-#define IRQ_AMIGA_BLIT		(IRQ_USER+6)
-
-/* Audio interrupts */
-#define IRQ_AMIGA_AUD0		(IRQ_USER+7)
-#define IRQ_AMIGA_AUD1		(IRQ_USER+8)
-#define IRQ_AMIGA_AUD2		(IRQ_USER+9)
-#define IRQ_AMIGA_AUD3		(IRQ_USER+10)
-
-/* CIA interrupt sources */
-#define IRQ_AMIGA_CIAA		(IRQ_USER+14)
-#define IRQ_AMIGA_CIAA_TA	(IRQ_USER+14)
-#define IRQ_AMIGA_CIAA_TB	(IRQ_USER+15)
-#define IRQ_AMIGA_CIAA_ALRM	(IRQ_USER+16)
-#define IRQ_AMIGA_CIAA_SP	(IRQ_USER+17)
-#define IRQ_AMIGA_CIAA_FLG	(IRQ_USER+18)
-#define IRQ_AMIGA_CIAB		(IRQ_USER+19)
-#define IRQ_AMIGA_CIAB_TA	(IRQ_USER+19)
-#define IRQ_AMIGA_CIAB_TB	(IRQ_USER+20)
-#define IRQ_AMIGA_CIAB_ALRM	(IRQ_USER+21)
-#define IRQ_AMIGA_CIAB_SP	(IRQ_USER+22)
-#define IRQ_AMIGA_CIAB_FLG	(IRQ_USER+23)
-
-
-/* INTREQR masks */
-#define IF_SETCLR   0x8000      /* set/clr bit */
-#define IF_INTEN    0x4000	/* master interrupt bit in INT* registers */
-#define IF_EXTER    0x2000	/* external level 6 and CIA B interrupt */
-#define IF_DSKSYN   0x1000	/* disk sync interrupt */
-#define IF_RBF	    0x0800	/* serial receive buffer full interrupt */
-#define IF_AUD3     0x0400	/* audio channel 3 done interrupt */
-#define IF_AUD2     0x0200	/* audio channel 2 done interrupt */
-#define IF_AUD1     0x0100	/* audio channel 1 done interrupt */
-#define IF_AUD0     0x0080	/* audio channel 0 done interrupt */
-#define IF_BLIT     0x0040	/* blitter done interrupt */
-#define IF_VERTB    0x0020	/* vertical blanking interrupt */
-#define IF_COPER    0x0010	/* copper interrupt */
-#define IF_PORTS    0x0008	/* external level 2 and CIA A interrupt */
-#define IF_SOFT     0x0004	/* software initiated interrupt */
-#define IF_DSKBLK   0x0002	/* diskblock DMA finished */
-#define IF_TBE	    0x0001	/* serial transmit buffer empty interrupt */
-
-/* CIA interrupt control register bits */
-
-#define CIA_ICR_TA	0x01
-#define CIA_ICR_TB	0x02
-#define CIA_ICR_ALRM	0x04
-#define CIA_ICR_SP	0x08
-#define CIA_ICR_FLG	0x10
-#define CIA_ICR_ALL	0x1f
-#define CIA_ICR_SETCLR	0x80
-
-extern void amiga_init_IRQ(void);
-
-/* to access the interrupt control registers of CIA's use only
-** these functions, they behave exactly like the amiga os routines
-*/
-
-extern struct ciabase ciaa_base, ciab_base;
-
-extern void cia_init_IRQ(struct ciabase *base);
-extern unsigned char cia_set_irq(struct ciabase *base, unsigned char mask);
-extern unsigned char cia_able_irq(struct ciabase *base, unsigned char mask);
-
-#endif /* asm-m68k/amigaints.h */