From af106246a394452a0bc2d11d3dd56b0a2788da04 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 11 Mar 2013 18:03:11 +0200 Subject: [PATCH] --- yaml --- r: 375279 b: refs/heads/master c: 78ce3ab1f4744986088b584a3d821abeb29e2735 h: refs/heads/master i: 375277: 00f9a89b63151fcf1aa0644bcfe28468ec7e363f 375275: d2d2cf670096b3fbbca9d482102e4bcc921409f4 375271: bdf473175b06499d5b01edc1109b5b18f835998f 375263: cf201dbf85d5fb713ba666d59b8db0a32f584ef2 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/commproc.h | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index ecf720ac0867..b3b6c9e2f0c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7136619ea05c341b90d11524b696a355af86c895 +refs/heads/master: 78ce3ab1f4744986088b584a3d821abeb29e2735 diff --git a/trunk/arch/m68k/include/asm/commproc.h b/trunk/arch/m68k/include/asm/commproc.h index a73998528d26..66a36bd51aa1 100644 --- a/trunk/arch/m68k/include/asm/commproc.h +++ b/trunk/arch/m68k/include/asm/commproc.h @@ -480,23 +480,6 @@ typedef struct scc_enet { #define SICR_ENET_CLKRT ((uint)0x0000003d) #endif -#ifdef CONFIG_RPXLITE -/* This ENET stuff is for the MPC850 with ethernet on SCC2. Some of - * this may be unique to the RPX-Lite configuration. - * Note TENA is on Port B. - */ -#define PA_ENET_RXD ((ushort)0x0004) -#define PA_ENET_TXD ((ushort)0x0008) -#define PA_ENET_TCLK ((ushort)0x0200) -#define PA_ENET_RCLK ((ushort)0x0800) -#define PB_ENET_TENA ((uint)0x00002000) -#define PC_ENET_CLSN ((ushort)0x0040) -#define PC_ENET_RENA ((ushort)0x0080) - -#define SICR_ENET_MASK ((uint)0x0000ff00) -#define SICR_ENET_CLKRT ((uint)0x00003d00) -#endif - #ifdef CONFIG_BSEIP /* This ENET stuff is for the MPC823 with ethernet on SCC2. * This is unique to the BSE ip-Engine board.