diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 14:56:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 14:56:01 -0800 |
| commit | ea44a160e6dc5d3d7c680ea72dfbabef80343839 (patch) | |
| tree | 417cb991a2cf72458aa4d9f71f6e6ed9768a8e4f /arch/m68k/include | |
| parent | 1fa185ebcbcefdc5229c783450c9f0439a69f0c1 (diff) | |
| parent | 21b30ca5da14613dcf8fd8350ecdb0d5d245e814 (diff) | |
| download | linux-stable-ea44a160e6dc5d3d7c680ea72dfbabef80343839.tar.gz linux-stable-ea44a160e6dc5d3d7c680ea72dfbabef80343839.tar.bz2 linux-stable-ea44a160e6dc5d3d7c680ea72dfbabef80343839.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"Nothing big, only a small collection of minor cleanups/fixes"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
arch: m68k: 68360: config: Remove unused function
m68knommu: fix irq handler types in 68360/commproc.c
m68k: remove check for CONFIG_BSEIP
Diffstat (limited to 'arch/m68k/include')
| -rw-r--r-- | arch/m68k/include/asm/commproc.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/m68k/include/asm/commproc.h b/arch/m68k/include/asm/commproc.h index 66a36bd51aa1..f41c96863e98 100644 --- a/arch/m68k/include/asm/commproc.h +++ b/arch/m68k/include/asm/commproc.h @@ -480,28 +480,6 @@ typedef struct scc_enet { #define SICR_ENET_CLKRT ((uint)0x0000003d) #endif -#ifdef CONFIG_BSEIP -/* This ENET stuff is for the MPC823 with ethernet on SCC2. - * This is unique to the BSE ip-Engine board. - */ -#define PA_ENET_RXD ((ushort)0x0004) -#define PA_ENET_TXD ((ushort)0x0008) -#define PA_ENET_TCLK ((ushort)0x0100) -#define PA_ENET_RCLK ((ushort)0x0200) -#define PB_ENET_TENA ((uint)0x00002000) -#define PC_ENET_CLSN ((ushort)0x0040) -#define PC_ENET_RENA ((ushort)0x0080) - -/* BSE uses port B and C bits for PHY control also. -*/ -#define PB_BSE_POWERUP ((uint)0x00000004) -#define PB_BSE_FDXDIS ((uint)0x00008000) -#define PC_BSE_LOOPBACK ((ushort)0x0800) - -#define SICR_ENET_MASK ((uint)0x0000ff00) -#define SICR_ENET_CLKRT ((uint)0x00002c00) -#endif - /* SCC Event register as used by Ethernet. */ #define SCCE_ENET_GRA ((ushort)0x0080) /* Graceful stop complete */ @@ -671,7 +649,7 @@ typedef struct scc_trans { /* #define CPMVEC_PIO_PC4 ((ushort)0x01) */ /* #define CPMVEC_ERROR ((ushort)0x00) */ -extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); +extern void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id); /* CPM interrupt configuration vector. */ |